diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
| commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
| tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /arch/arm/Kconfig | |
| parent | 143070e74630b9557e1bb64d899ff2cc5a1dcb48 (diff) | |
| parent | 947391cfbaa3b08558844c0b187bcd0223c3f660 (diff) | |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e60ec54df334..9d02cdb15b23 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -273,6 +273,7 @@ config ARCH_EP93XX | |||
| 273 | select HAVE_CLK | 273 | select HAVE_CLK |
| 274 | select COMMON_CLKDEV | 274 | select COMMON_CLKDEV |
| 275 | select ARCH_REQUIRE_GPIOLIB | 275 | select ARCH_REQUIRE_GPIOLIB |
| 276 | select ARCH_HAS_HOLES_MEMORYMODEL | ||
| 276 | help | 277 | help |
| 277 | This enables support for the Cirrus EP93xx series of CPUs. | 278 | This enables support for the Cirrus EP93xx series of CPUs. |
| 278 | 279 | ||
| @@ -976,10 +977,9 @@ config OABI_COMPAT | |||
| 976 | UNPREDICTABLE (in fact it can be predicted that it won't work | 977 | UNPREDICTABLE (in fact it can be predicted that it won't work |
| 977 | at all). If in doubt say Y. | 978 | at all). If in doubt say Y. |
| 978 | 979 | ||
| 979 | config ARCH_FLATMEM_HAS_HOLES | 980 | config ARCH_HAS_HOLES_MEMORYMODEL |
| 980 | bool | 981 | bool |
| 981 | default y | 982 | default n |
| 982 | depends on FLATMEM | ||
| 983 | 983 | ||
| 984 | # Discontigmem is deprecated | 984 | # Discontigmem is deprecated |
| 985 | config ARCH_DISCONTIGMEM_ENABLE | 985 | config ARCH_DISCONTIGMEM_ENABLE |