diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 16:45:56 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 16:45:56 +0900 |
| commit | 921a220857cdd3c553cde7c114f9f6757ac80cd5 (patch) | |
| tree | 526610397dfb83d72c43c94300deea23d26e782a /arch/arm/configs/nuc960_defconfig | |
| parent | 17eb9d62828c3688f41f31ac00d7fee6da9675bf (diff) | |
| parent | 2f48912d1443a796f10c42c89cb386f0e3eca04d (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm/configs/nuc960_defconfig')
| -rw-r--r-- | arch/arm/configs/nuc960_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/nuc960_defconfig b/arch/arm/configs/nuc960_defconfig index 4b2cd9eae9b..aa7e128f5d7 100644 --- a/arch/arm/configs/nuc960_defconfig +++ b/arch/arm/configs/nuc960_defconfig @@ -201,7 +201,6 @@ CONFIG_MACH_W90N960EVB=y # # Processor Type # -CONFIG_CPU_32=y CONFIG_CPU_ARM926T=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5TJ=y |