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/sam9_l9260_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/sam9_l9260_defconfig')
| -rw-r--r-- | arch/arm/configs/sam9_l9260_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/sam9_l9260_defconfig b/arch/arm/configs/sam9_l9260_defconfig index 1174e2764875..81b290ad5d25 100644 --- a/arch/arm/configs/sam9_l9260_defconfig +++ b/arch/arm/configs/sam9_l9260_defconfig | |||
| @@ -175,7 +175,6 @@ CONFIG_MTD_AT91_DATAFLASH_CARD=y | |||
| 175 | # | 175 | # |
| 176 | # Processor Type | 176 | # Processor Type |
| 177 | # | 177 | # |
| 178 | CONFIG_CPU_32=y | ||
| 179 | CONFIG_CPU_ARM926T=y | 178 | CONFIG_CPU_ARM926T=y |
| 180 | CONFIG_CPU_32v5=y | 179 | CONFIG_CPU_32v5=y |
| 181 | CONFIG_CPU_ABRT_EV5TJ=y | 180 | CONFIG_CPU_ABRT_EV5TJ=y |