diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 15:09:06 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 15:09:06 -0500 |
| commit | ca869912366f60cb5e0bdd09f65e80ee6816e73c (patch) | |
| tree | a72913a29495ca078987c09fc0008f47e11b900b /arch/arm/mm/Kconfig | |
| parent | dd8a306ac0c918268bd2ae89da2dea627f6e352d (diff) | |
| parent | 388f7ef720a982f49925e7b4e96f216f208f8c03 (diff) | |
Merge with /home/shaggy/git/linus-clean/
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 e3c14d6b4328..e84fdde6edf8 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -102,8 +102,8 @@ config CPU_ARM922T | |||
| 102 | # ARM925T | 102 | # ARM925T |
| 103 | config CPU_ARM925T | 103 | config CPU_ARM925T |
| 104 | bool "Support ARM925T processor" if ARCH_OMAP1 | 104 | bool "Support ARM925T processor" if ARCH_OMAP1 |
| 105 | depends on ARCH_OMAP1510 | 105 | depends on ARCH_OMAP15XX |
| 106 | default y if ARCH_OMAP1510 | 106 | default y if ARCH_OMAP15XX |
| 107 | select CPU_32v4 | 107 | select CPU_32v4 |
| 108 | select CPU_ABRT_EV4T | 108 | select CPU_ABRT_EV4T |
| 109 | select CPU_CACHE_V4WT | 109 | select CPU_CACHE_V4WT |
| @@ -242,7 +242,7 @@ config CPU_XSCALE | |||
| 242 | # ARMv6 | 242 | # ARMv6 |
| 243 | config CPU_V6 | 243 | config CPU_V6 |
| 244 | bool "Support ARM V6 processor" | 244 | bool "Support ARM V6 processor" |
| 245 | depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB | 245 | depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 |
| 246 | select CPU_32v6 | 246 | select CPU_32v6 |
| 247 | select CPU_ABRT_EV6 | 247 | select CPU_ABRT_EV6 |
| 248 | select CPU_CACHE_V6 | 248 | select CPU_CACHE_V6 |