diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 10:58:59 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 10:58:59 (GMT) |
| commit | df762eccbadf87850fbee444d729e0f1b1e946f1 (patch) | |
| tree | 1bf47bbbd4ea91e343f983b3b50ec2ec73a739e1 /arch/arm/mach-highbank | |
| parent | ec1e20a02fe33b767ffcca8920a32211492416d7 (diff) | |
| parent | 70d42126877b9faa272d446a6de5917614c28dd9 (diff) | |
| download | linux-df762eccbadf87850fbee444d729e0f1b1e946f1.tar.xz | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/include/asm/atomic.h
arch/arm/include/asm/hardirq.h
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/mach-highbank')
| -rw-r--r-- | arch/arm/mach-highbank/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig index 8e8437d..3c3bff7 100644 --- a/arch/arm/mach-highbank/Kconfig +++ b/arch/arm/mach-highbank/Kconfig @@ -4,6 +4,7 @@ config ARCH_HIGHBANK select ARCH_HAS_CPUFREQ select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_HAS_OPP + select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_AMBA select ARM_ERRATA_764369 |