diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 21:32:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 21:32:14 -0800 |
| commit | 7f36b1e9582c06d0ddef5f2416c9b17017647d1f (patch) | |
| tree | f83cbcef623476b9b8a14f7a0cc66eb92552a651 /arch/arm/mm/Kconfig | |
| parent | 0e016b9fa134d79341cca5e336ccbcea066d5f81 (diff) | |
| parent | 73ee723e4c6d179c2e9496cc4caf160a18d95603 (diff) | |
| download | kernel_samsung_smdk4412-7f36b1e9582c06d0ddef5f2416c9b17017647d1f.zip kernel_samsung_smdk4412-7f36b1e9582c06d0ddef5f2416c9b17017647d1f.tar.gz kernel_samsung_smdk4412-7f36b1e9582c06d0ddef5f2416c9b17017647d1f.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mm/Kconfig')
| -rw-r--r-- | arch/arm/mm/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index c54e04c..5568403 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -120,8 +120,8 @@ config CPU_ARM925T # ARM926T config CPU_ARM926T - bool "Support ARM926T processor" if ARCH_INTEGRATOR - depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX + bool "Support ARM926T processor" + depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX select CPU_32v5 select CPU_ABRT_EV5TJ @@ -242,7 +242,7 @@ config CPU_XSCALE # ARMv6 config CPU_V6 bool "Support ARM V6 processor" - depends on ARCH_INTEGRATOR + depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB select CPU_32v6 select CPU_ABRT_EV6 select CPU_CACHE_V6 |