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/omap3_pandora_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/omap3_pandora_defconfig')
| -rw-r--r-- | arch/arm/configs/omap3_pandora_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/omap3_pandora_defconfig b/arch/arm/configs/omap3_pandora_defconfig index b7a8d9fa49db..f74eb9a1d191 100644 --- a/arch/arm/configs/omap3_pandora_defconfig +++ b/arch/arm/configs/omap3_pandora_defconfig | |||
| @@ -211,7 +211,6 @@ CONFIG_MACH_OMAP3_PANDORA=y | |||
| 211 | # | 211 | # |
| 212 | # Processor Type | 212 | # Processor Type |
| 213 | # | 213 | # |
| 214 | CONFIG_CPU_32=y | ||
| 215 | CONFIG_CPU_32v6K=y | 214 | CONFIG_CPU_32v6K=y |
| 216 | CONFIG_CPU_V7=y | 215 | CONFIG_CPU_V7=y |
| 217 | CONFIG_CPU_32v7=y | 216 | CONFIG_CPU_32v7=y |