diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-31 10:43:50 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-31 10:43:50 +0100 |
commit | dc767302872a55c9849aade1719134a2ba7528b0 (patch) | |
tree | b55bfce70e8a825e9a041b3a96fdf6485589bed1 /arch/arm/mach-mvebu/Kconfig | |
parent | 696e897344f58397b3d463fbb9f9a2f317d720c0 (diff) | |
parent | 483a53b310dfefdd8c010ba0cc5b2addfaef123f (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
arch/arm/include/asm/hardware/coresight.h
Diffstat (limited to 'arch/arm/mach-mvebu/Kconfig')
-rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 80a8bcacd9d5..317cdb800099 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -1,5 +1,6 @@ config ARCH_MVEBU bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7 + select ARCH_SUPPORTS_BIG_ENDIAN select CLKSRC_MMIO select COMMON_CLK select GENERIC_CLOCKEVENTS |