diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-27 20:43:41 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-30 18:20:26 -0400 |
| commit | 2098990e7c558c175b96213d41058983e00a7919 (patch) | |
| tree | 361449d9c852d07544b16dd0daec5a72541e8bda /arch/arm/Kconfig | |
| parent | 5e4432d3bd6b5b19e10bb263e7dbe8e74d7cf1c2 (diff) | |
| parent | fdb07aee0b2b9d7d1893c97f5ce79ec355caaf1f (diff) | |
Merge branch 'baserock/bjdooks/312-rc4/be/core-v3' of git://git.baserock.org/delta/linux into devel-stable
Conflicts:
arch/arm/kernel/head.S
This series has been well tested and it would be great to get this
merged now.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3917dd4f270c..585218778a1b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -483,6 +483,7 @@ config ARCH_IXP4XX | |||
| 483 | bool "IXP4xx-based" | 483 | bool "IXP4xx-based" |
| 484 | depends on MMU | 484 | depends on MMU |
| 485 | select ARCH_HAS_DMA_SET_COHERENT_MASK | 485 | select ARCH_HAS_DMA_SET_COHERENT_MASK |
| 486 | select ARCH_SUPPORTS_BIG_ENDIAN | ||
| 486 | select ARCH_REQUIRE_GPIOLIB | 487 | select ARCH_REQUIRE_GPIOLIB |
| 487 | select CLKSRC_MMIO | 488 | select CLKSRC_MMIO |
| 488 | select CPU_XSCALE | 489 | select CPU_XSCALE |