diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/arm/configs/ams_delta_defconfig | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'arch/arm/configs/ams_delta_defconfig')
| -rw-r--r-- | arch/arm/configs/ams_delta_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/ams_delta_defconfig b/arch/arm/configs/ams_delta_defconfig index e8f7380b67d6..3b3a3775bbf4 100644 --- a/arch/arm/configs/ams_delta_defconfig +++ b/arch/arm/configs/ams_delta_defconfig | |||
| @@ -210,7 +210,6 @@ CONFIG_OMAP_ARM_150MHZ=y | |||
| 210 | # | 210 | # |
| 211 | # Processor Type | 211 | # Processor Type |
| 212 | # | 212 | # |
| 213 | CONFIG_CPU_32=y | ||
| 214 | CONFIG_CPU_ARM925T=y | 213 | CONFIG_CPU_ARM925T=y |
| 215 | CONFIG_CPU_32v4T=y | 214 | CONFIG_CPU_32v4T=y |
| 216 | CONFIG_CPU_ABRT_EV4T=y | 215 | CONFIG_CPU_ABRT_EV4T=y |