diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 15:57:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 15:57:45 -0500 |
| commit | 756fe285070feb254a770cefc5640fe005ea9c27 (patch) | |
| tree | c391c039bc8ef7ec6958017413aba250210e9af6 /arch/arm/configs/s5pc100_defconfig | |
| parent | eec74a410fafd32c8f832d47dc196006ade68d05 (diff) | |
| parent | ed5a35acbb48d512332a53565e6341c65eecfa29 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
VIDEO: cyberpro: pci_request_regions needs a persistent name
ARM: dma-isa: request cascade channel after registering it
ARM: footbridge: trim down old ISA rtc setup
ARM: fix PAGE_KERNEL
ARM: Fix wrong shared bit for CPU write buffer bug test
ARM: 5857/1: ARM: dmabounce: fix build
ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900
ARM: 5855/1: putc support for nuc900
ARM: 5854/1: fix compiling error for NUC900
ARM: 5849/1: ARMv7: fix Oprofile events count
ARM: add missing include to nwflash.c
ARM: Kill CONFIG_CPU_32
ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread()
ARM: 5853/1: ARM: Fix build break on ARM v6 and v7
Diffstat (limited to 'arch/arm/configs/s5pc100_defconfig')
| -rw-r--r-- | arch/arm/configs/s5pc100_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/s5pc100_defconfig b/arch/arm/configs/s5pc100_defconfig index b0d7d3d3a5e3..dc108afc060c 100644 --- a/arch/arm/configs/s5pc100_defconfig +++ b/arch/arm/configs/s5pc100_defconfig | |||
| @@ -202,7 +202,6 @@ CONFIG_MACH_SMDKC100=y | |||
| 202 | # | 202 | # |
| 203 | # Processor Type | 203 | # Processor Type |
| 204 | # | 204 | # |
| 205 | CONFIG_CPU_32=y | ||
| 206 | CONFIG_CPU_32v6K=y | 205 | CONFIG_CPU_32v6K=y |
| 207 | CONFIG_CPU_V7=y | 206 | CONFIG_CPU_V7=y |
| 208 | CONFIG_CPU_32v7=y | 207 | CONFIG_CPU_32v7=y |