diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:16 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:16 +0000 |
commit | a32737e1ca650504f172292dd344eb64c02311f3 (patch) | |
tree | 7dd2004ece26081507af877d9dd40b1bd4eecc1a /arch/arm/Kconfig | |
parent | 27edacac7d97d37ec77779c7da08345298a5d283 (diff) | |
parent | a3c2b511a844641f6d0b60bd84cd6076143b3f2d (diff) | |
download | blackbird-obmc-linux-a32737e1ca650504f172292dd344eb64c02311f3.tar.gz blackbird-obmc-linux-a32737e1ca650504f172292dd344eb64c02311f3.zip |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b259c7c644e3..3a07864905d2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -258,6 +258,7 @@ config ARCH_INTEGRATOR select ARCH_HAS_CPUFREQ select CLKDEV_LOOKUP select HAVE_MACH_CLKDEV + select HAVE_TCM select ICST select GENERIC_CLOCKEVENTS select PLAT_VERSATILE @@ -1126,6 +1127,11 @@ config ARM_TIMER_SP804 source arch/arm/mm/Kconfig +config ARM_NR_BANKS + int + default 16 if ARCH_EP93XX + default 8 + config IWMMXT bool "Enable iWMMXt support" depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 @@ -1560,6 +1566,16 @@ config LOCAL_TIMERS accounting to be spread across the timer interval, preventing a "thundering herd" at every timer tick. +config ARCH_NR_GPIO + int + default 1024 if ARCH_SHMOBILE || ARCH_TEGRA + default 350 if ARCH_U8500 + default 0 + help + Maximum number of GPIOs in the system. + + If unsure, leave the default value. + source kernel/Kconfig.preempt config HZ |