aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/Kconfig
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-08-04 08:46:24 +0300
committerTony Lindgren <tony@atomide.com>2010-08-04 08:46:24 +0300
commit331d919af416b9b92428947ef8c535a3e24c6b31 (patch)
tree1f58dfe4ea6ed130f7b970f07cd7589864e9cbad /arch/arm/mach-omap1/Kconfig
parent047b51fb208c716294b4682c904df8a3ad8b6a69 (diff)
parentfb8ce14c7e16bd218decb3e1655c5d4ff08042f2 (diff)
downloadkernel_samsung_smdk4412-331d919af416b9b92428947ef8c535a3e24c6b31.zip
kernel_samsung_smdk4412-331d919af416b9b92428947ef8c535a3e24c6b31.tar.gz
kernel_samsung_smdk4412-331d919af416b9b92428947ef8c535a3e24c6b31.tar.bz2
Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/Kconfig')
-rw-r--r--arch/arm/mach-omap1/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index c911cdb..3b02d3b 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -228,6 +228,12 @@ config OMAP_ARM_120MHZ
help
Enable 120MHz clock for OMAP CPU. If unsure, say N.
+config OMAP_ARM_96MHZ
+ bool "OMAP ARM 96 MHz CPU"
+ depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)
+ help
+ Enable 96MHz clock for OMAP CPU. If unsure, say N.
+
config OMAP_ARM_60MHZ
bool "OMAP ARM 60 MHz CPU"
depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)