diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 22:38:25 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 22:38:25 +0100 |
| commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
| tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /arch/arm/configs/pleb_defconfig | |
| parent | of: unify phandle name in struct device_node (diff) | |
| parent | Linux 2.6.33-rc5 (diff) | |
| download | linux-0ada0a73120c28cc432bcdbac061781465c2f48f.tar.xz linux-0ada0a73120c28cc432bcdbac061781465c2f48f.zip | |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'arch/arm/configs/pleb_defconfig')
| -rw-r--r-- | arch/arm/configs/pleb_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/pleb_defconfig b/arch/arm/configs/pleb_defconfig index f2d2dda25949..dbfabb5eede8 100644 --- a/arch/arm/configs/pleb_defconfig +++ b/arch/arm/configs/pleb_defconfig @@ -100,7 +100,6 @@ CONFIG_SA1100_PLEB=y # # Processor Type # -CONFIG_CPU_32=y CONFIG_CPU_SA1100=y CONFIG_CPU_32v4=y CONFIG_CPU_ABRT_EV4=y |