diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 20:11:29 +0100 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 20:11:29 +0100 |
| commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
| tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /arch/arm/mach-omap1/Kconfig | |
| parent | slub: disallow changing cpu_partial from userspace for debug caches (diff) | |
| parent | slub: add missed accounting (diff) | |
| download | linux-5878cf431ca7233a56819ca6970153ac0b129599.tar.xz linux-5878cf431ca7233a56819ca6970153ac0b129599.zip | |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'arch/arm/mach-omap1/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap1/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index e0a028161dde..73f287d6429b 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -171,14 +171,6 @@ config MACH_OMAP_GENERIC comment "OMAP CPU Speed" depends on ARCH_OMAP1 -config OMAP_CLOCKS_SET_BY_BOOTLOADER - bool "OMAP clocks set by bootloader" - depends on ARCH_OMAP1 - help - Enable this option to prevent the kernel from overriding the clock - frequencies programmed by bootloader for MPU, DSP, MMUs, TC, - internal LCD controller and MPU peripherals. - config OMAP_ARM_216MHZ bool "OMAP ARM 216 MHz CPU (1710 only)" depends on ARCH_OMAP1 && ARCH_OMAP16XX |