diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /arch/arm/configs/colibri_pxa300_defconfig | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/arm/configs/colibri_pxa300_defconfig')
| -rw-r--r-- | arch/arm/configs/colibri_pxa300_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/colibri_pxa300_defconfig b/arch/arm/configs/colibri_pxa300_defconfig index 4774a36fa740..11fdb5afdec7 100644 --- a/arch/arm/configs/colibri_pxa300_defconfig +++ b/arch/arm/configs/colibri_pxa300_defconfig | |||
| @@ -212,7 +212,6 @@ CONFIG_PXA3xx=y | |||
| 212 | # | 212 | # |
| 213 | # Processor Type | 213 | # Processor Type |
| 214 | # | 214 | # |
| 215 | CONFIG_CPU_32=y | ||
| 216 | CONFIG_CPU_XSC3=y | 215 | CONFIG_CPU_XSC3=y |
| 217 | CONFIG_CPU_32v5=y | 216 | CONFIG_CPU_32v5=y |
| 218 | CONFIG_CPU_ABRT_EV5T=y | 217 | CONFIG_CPU_ABRT_EV5T=y |