diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/arm/configs/eseries_pxa_defconfig | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/arm/configs/eseries_pxa_defconfig')
| -rw-r--r-- | arch/arm/configs/eseries_pxa_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig index b6c5cbbf4c85..74baf5709290 100644 --- a/arch/arm/configs/eseries_pxa_defconfig +++ b/arch/arm/configs/eseries_pxa_defconfig | |||
| @@ -203,7 +203,6 @@ CONFIG_PXA_HAVE_BOARD_IRQS=y | |||
| 203 | # | 203 | # |
| 204 | # Processor Type | 204 | # Processor Type |
| 205 | # | 205 | # |
| 206 | CONFIG_CPU_32=y | ||
| 207 | CONFIG_CPU_XSCALE=y | 206 | CONFIG_CPU_XSCALE=y |
| 208 | CONFIG_CPU_32v5=y | 207 | CONFIG_CPU_32v5=y |
| 209 | CONFIG_CPU_ABRT_EV5T=y | 208 | CONFIG_CPU_ABRT_EV5T=y |