diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
| commit | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch) | |
| tree | f41c17eac157b1223ce104845cf9b1e5a9e6a83d /arch/arm/mach-s3c2412 | |
| parent | 58daf18cdcab550262a5f4681e1f1e073e21965a (diff) | |
| parent | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (diff) | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/mach-s3c2412')
| -rw-r--r-- | arch/arm/mach-s3c2412/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig index 6983cb4d4cae..e82ab4aa7ab9 100644 --- a/arch/arm/mach-s3c2412/Kconfig +++ b/arch/arm/mach-s3c2412/Kconfig | |||
| @@ -59,7 +59,7 @@ config MACH_JIVE | |||
| 59 | Say Y here if you are using the Logitech Jive. | 59 | Say Y here if you are using the Logitech Jive. |
| 60 | 60 | ||
| 61 | config MACH_JIVE_SHOW_BOOTLOADER | 61 | config MACH_JIVE_SHOW_BOOTLOADER |
| 62 | bool "Allow access to bootloader partitions in MTD" | 62 | bool "Allow access to bootloader partitions in MTD (EXPERIMENTAL)" |
| 63 | depends on MACH_JIVE && EXPERIMENTAL | 63 | depends on MACH_JIVE && EXPERIMENTAL |
| 64 | 64 | ||
| 65 | config MACH_SMDK2413 | 65 | config MACH_SMDK2413 |