diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-10 12:57:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-10 12:57:49 -0700 |
| commit | 5c23804a0941a111752fdacefe0bea2db1b4d93f (patch) | |
| tree | 482436cd247783c7df3d522fdc4ee51e2b3e87dc /arch/arm/Kconfig | |
| parent | 58c853c6eabe93ab5e5daf7150fbb4e562acbb79 (diff) | |
| parent | ec6bced6c7b92904f5ead39c9c1b8dc734e6eff0 (diff) | |
Merge master.kernel.org:~rmk/linux-2.6-arm.git
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 620f2ca94ed..8752751f998 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -223,7 +223,9 @@ source "arch/arm/mach-pxa/Kconfig" source "arch/arm/mach-sa1100/Kconfig" -source "arch/arm/mach-omap/Kconfig" +source "arch/arm/plat-omap/Kconfig" + +source "arch/arm/mach-omap1/Kconfig" source "arch/arm/mach-s3c2410/Kconfig" @@ -514,7 +516,7 @@ config XIP_PHYS_ADDR endmenu -if (ARCH_SA1100 || ARCH_INTEGRATOR) +if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP1) menu "CPU Frequency scaling" |