diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:09:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:09:30 -0500 |
| commit | 3995f4c5327595b51482bdac8c189736262eb6e0 (patch) | |
| tree | ef768d0ecf243a2376bfc646b847964313146d3e /arch/arm/configs/simpad_defconfig | |
| parent | 05814450070f13b671fc9dbf89477677aa0258cb (diff) | |
| parent | fe38ea5623d262afc0b92ea47b8a7d8c988521d2 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/configs/simpad_defconfig')
| -rw-r--r-- | arch/arm/configs/simpad_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/simpad_defconfig b/arch/arm/configs/simpad_defconfig index 5373eeb7d578..2e5a616cc98d 100644 --- a/arch/arm/configs/simpad_defconfig +++ b/arch/arm/configs/simpad_defconfig | |||
| @@ -64,7 +64,6 @@ CONFIG_KMOD=y | |||
| 64 | # CONFIG_ARCH_CLPS711X is not set | 64 | # CONFIG_ARCH_CLPS711X is not set |
| 65 | # CONFIG_ARCH_CO285 is not set | 65 | # CONFIG_ARCH_CO285 is not set |
| 66 | # CONFIG_ARCH_EBSA110 is not set | 66 | # CONFIG_ARCH_EBSA110 is not set |
| 67 | # CONFIG_ARCH_CAMELOT is not set | ||
| 68 | # CONFIG_ARCH_FOOTBRIDGE is not set | 67 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| 69 | # CONFIG_ARCH_INTEGRATOR is not set | 68 | # CONFIG_ARCH_INTEGRATOR is not set |
| 70 | # CONFIG_ARCH_IOP3XX is not set | 69 | # CONFIG_ARCH_IOP3XX is not set |