diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 01:46:24 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 01:46:24 -0400 |
| commit | 331d919af416b9b92428947ef8c535a3e24c6b31 (patch) | |
| tree | 1f58dfe4ea6ed130f7b970f07cd7589864e9cbad /arch/arm/mach-omap1/Kconfig | |
| parent | 047b51fb208c716294b4682c904df8a3ad8b6a69 (diff) | |
| parent | fb8ce14c7e16bd218decb3e1655c5d4ff08042f2 (diff) | |
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/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index c911cdbf886f..3b02d3b944af 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
| @@ -228,6 +228,12 @@ config OMAP_ARM_120MHZ | |||
| 228 | help | 228 | help |
| 229 | Enable 120MHz clock for OMAP CPU. If unsure, say N. | 229 | Enable 120MHz clock for OMAP CPU. If unsure, say N. |
| 230 | 230 | ||
| 231 | config OMAP_ARM_96MHZ | ||
| 232 | bool "OMAP ARM 96 MHz CPU" | ||
| 233 | depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850) | ||
| 234 | help | ||
| 235 | Enable 96MHz clock for OMAP CPU. If unsure, say N. | ||
| 236 | |||
| 231 | config OMAP_ARM_60MHZ | 237 | config OMAP_ARM_60MHZ |
| 232 | bool "OMAP ARM 60 MHz CPU" | 238 | bool "OMAP ARM 60 MHz CPU" |
| 233 | depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850) | 239 | depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850) |