diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-06 01:49:08 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-06 01:49:08 -0500 |
| commit | fa94ddea2b29fdda7640672c8a933dbd901f0278 (patch) | |
| tree | 4e9204f1438f5ed44bff31e2abee598ad775321d /arch/arm/configs/lpd7a404_defconfig | |
| parent | 6fbfe8d7cd7e71ceb281c5a1b9de6e5e0dfbf1c8 (diff) | |
| parent | 56d45b62ce622a003da972428fdbba2b42102efb (diff) | |
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'arch/arm/configs/lpd7a404_defconfig')
| -rw-r--r-- | arch/arm/configs/lpd7a404_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/lpd7a404_defconfig b/arch/arm/configs/lpd7a404_defconfig index 7a2e932da1c6..142cccdd971e 100644 --- a/arch/arm/configs/lpd7a404_defconfig +++ b/arch/arm/configs/lpd7a404_defconfig | |||
| @@ -117,7 +117,6 @@ CONFIG_ARCH_LH7A404=y | |||
| 117 | # | 117 | # |
| 118 | # Processor Type | 118 | # Processor Type |
| 119 | # | 119 | # |
| 120 | CONFIG_CPU_32=y | ||
| 121 | CONFIG_CPU_ARM922T=y | 120 | CONFIG_CPU_ARM922T=y |
| 122 | CONFIG_CPU_32v4=y | 121 | CONFIG_CPU_32v4=y |
| 123 | CONFIG_CPU_ABRT_EV4T=y | 122 | CONFIG_CPU_ABRT_EV4T=y |