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/colibri_pxa270_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/colibri_pxa270_defconfig')
| -rw-r--r-- | arch/arm/configs/colibri_pxa270_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/colibri_pxa270_defconfig b/arch/arm/configs/colibri_pxa270_defconfig index 4cf3bde1c522..c962870b3f85 100644 --- a/arch/arm/configs/colibri_pxa270_defconfig +++ b/arch/arm/configs/colibri_pxa270_defconfig | |||
| @@ -204,7 +204,6 @@ CONFIG_PXA27x=y | |||
| 204 | # | 204 | # |
| 205 | # Processor Type | 205 | # Processor Type |
| 206 | # | 206 | # |
| 207 | CONFIG_CPU_32=y | ||
| 208 | CONFIG_CPU_XSCALE=y | 207 | CONFIG_CPU_XSCALE=y |
| 209 | CONFIG_CPU_32v5=y | 208 | CONFIG_CPU_32v5=y |
| 210 | CONFIG_CPU_ABRT_EV5T=y | 209 | CONFIG_CPU_ABRT_EV5T=y |