summaryrefslogtreecommitdiff
path: root/arch/sh/boards/magicpanelr2/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-15 15:46:29 +0400
committerIngo Molnar <mingo@elte.hu>2008-10-15 15:46:29 +0400
commitb2aaf8f74cdc84a9182f6cabf198b7763bcb9d40 (patch)
tree53ccb1c2c14751fe69cf93102e76e97021f6df07 /arch/sh/boards/magicpanelr2/Kconfig
parent4f962d4d65923d7b722192e729840cfb79af0a5a (diff)
parent278429cff8809958d25415ba0ed32b59866ab1a8 (diff)
downloadlinux-b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40.tar.xz
Merge branch 'linus' into stackprotector
Conflicts: arch/x86/kernel/Makefile include/asm-x86/pda.h
Diffstat (limited to 'arch/sh/boards/magicpanelr2/Kconfig')
-rw-r--r--arch/sh/boards/magicpanelr2/Kconfig13
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/sh/boards/magicpanelr2/Kconfig b/arch/sh/boards/magicpanelr2/Kconfig
deleted file mode 100644
index b0abddc3e84f..000000000000
--- a/arch/sh/boards/magicpanelr2/Kconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-if SH_MAGIC_PANEL_R2
-
-menu "Magic Panel R2 options"
-
-config SH_MAGIC_PANEL_R2_VERSION
- int SH_MAGIC_PANEL_R2_VERSION
- default "3"
- help
- Set the version of the Magic Panel R2
-
-endmenu
-
-endif