diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:09:30 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:09:30 -0800 |
commit | 3995f4c5327595b51482bdac8c189736262eb6e0 (patch) | |
tree | ef768d0ecf243a2376bfc646b847964313146d3e /arch/arm/configs/lpd7a400_defconfig | |
parent | 05814450070f13b671fc9dbf89477677aa0258cb (diff) | |
parent | fe38ea5623d262afc0b92ea47b8a7d8c988521d2 (diff) | |
download | talos-op-linux-3995f4c5327595b51482bdac8c189736262eb6e0.tar.gz talos-op-linux-3995f4c5327595b51482bdac8c189736262eb6e0.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/configs/lpd7a400_defconfig')
-rw-r--r-- | arch/arm/configs/lpd7a400_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/lpd7a400_defconfig b/arch/arm/configs/lpd7a400_defconfig index d64706d3ff35..67eaa26c2647 100644 --- a/arch/arm/configs/lpd7a400_defconfig +++ b/arch/arm/configs/lpd7a400_defconfig @@ -60,7 +60,6 @@ CONFIG_BASE_SMALL=0 # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set -# CONFIG_ARCH_CAMELOT is not set # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_IOP3XX is not set |