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/shark_defconfig | |
| parent | 6fbfe8d7cd7e71ceb281c5a1b9de6e5e0dfbf1c8 (diff) | |
| parent | 56d45b62ce622a003da972428fdbba2b42102efb (diff) | |
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'arch/arm/configs/shark_defconfig')
| -rw-r--r-- | arch/arm/configs/shark_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/shark_defconfig b/arch/arm/configs/shark_defconfig index 90235bf7a1de..46de1247d127 100644 --- a/arch/arm/configs/shark_defconfig +++ b/arch/arm/configs/shark_defconfig | |||
| @@ -173,7 +173,6 @@ CONFIG_ARCH_SHARK=y | |||
| 173 | # | 173 | # |
| 174 | # Processor Type | 174 | # Processor Type |
| 175 | # | 175 | # |
| 176 | CONFIG_CPU_32=y | ||
| 177 | CONFIG_CPU_SA110=y | 176 | CONFIG_CPU_SA110=y |
| 178 | CONFIG_CPU_32v4=y | 177 | CONFIG_CPU_32v4=y |
| 179 | CONFIG_CPU_ABRT_EV4=y | 178 | CONFIG_CPU_ABRT_EV4=y |