diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 16:17:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 16:17:48 +0300 |
| commit | 15e7f8b92aed71819411025279cd3df37f8c636b (patch) | |
| tree | 6bc90fd9fcdd4e58321e3f881b2fbcb108a6a654 /arch/arm/configs/stmp37xx_defconfig | |
| parent | 21949f00a022e090a7e8bc9a01dfca88273c6146 (diff) | |
| parent | ef18beded8ddbaafdf4914bab209f77e60ae3a18 (diff) | |
| download | linux-15e7f8b92aed71819411025279cd3df37f8c636b.tar.xz | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'arch/arm/configs/stmp37xx_defconfig')
| -rw-r--r-- | arch/arm/configs/stmp37xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/stmp37xx_defconfig b/arch/arm/configs/stmp37xx_defconfig index 401279d531d5..a3751c9e1416 100644 --- a/arch/arm/configs/stmp37xx_defconfig +++ b/arch/arm/configs/stmp37xx_defconfig @@ -182,7 +182,6 @@ CONFIG_MACH_STMP37XX=y # # Processor Type # -CONFIG_CPU_32=y CONFIG_CPU_ARM926T=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5TJ=y |