diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 05:04:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 05:04:24 -0400 |
| commit | 42f1d2e06a25628ae4ceaadccc4fa67c7787e2b4 (patch) | |
| tree | 8aac83e399de7ad13748a59853a0feea9ed2c5cb /arch/arm/Kconfig | |
| parent | 9af5324a070e0b2dcb6e22c89e17424eba245fcc (diff) | |
| parent | 77bbca138c64cb80259732db6f70e1668123f2a7 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c52f6909f65d..65bf774a26fd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -281,6 +281,7 @@ config ARCH_EP93XX | |||
| 281 | select HAVE_CLK | 281 | select HAVE_CLK |
| 282 | select COMMON_CLKDEV | 282 | select COMMON_CLKDEV |
| 283 | select ARCH_REQUIRE_GPIOLIB | 283 | select ARCH_REQUIRE_GPIOLIB |
| 284 | select ARCH_HAS_HOLES_MEMORYMODEL | ||
| 284 | help | 285 | help |
| 285 | This enables support for the Cirrus EP93xx series of CPUs. | 286 | This enables support for the Cirrus EP93xx series of CPUs. |
| 286 | 287 | ||
| @@ -595,6 +596,7 @@ config ARCH_DAVINCI | |||
| 595 | select ZONE_DMA | 596 | select ZONE_DMA |
| 596 | select HAVE_IDE | 597 | select HAVE_IDE |
| 597 | select COMMON_CLKDEV | 598 | select COMMON_CLKDEV |
| 599 | select GENERIC_ALLOCATOR | ||
| 598 | help | 600 | help |
| 599 | Support for TI's DaVinci platform. | 601 | Support for TI's DaVinci platform. |
| 600 | 602 | ||
| @@ -965,10 +967,9 @@ config OABI_COMPAT | |||
| 965 | UNPREDICTABLE (in fact it can be predicted that it won't work | 967 | UNPREDICTABLE (in fact it can be predicted that it won't work |
| 966 | at all). If in doubt say Y. | 968 | at all). If in doubt say Y. |
| 967 | 969 | ||
| 968 | config ARCH_FLATMEM_HAS_HOLES | 970 | config ARCH_HAS_HOLES_MEMORYMODEL |
| 969 | bool | 971 | bool |
| 970 | default y | 972 | default n |
| 971 | depends on FLATMEM | ||
| 972 | 973 | ||
| 973 | # Discontigmem is deprecated | 974 | # Discontigmem is deprecated |
| 974 | config ARCH_DISCONTIGMEM_ENABLE | 975 | config ARCH_DISCONTIGMEM_ENABLE |