aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs/h7201_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 15:09:30 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 15:09:30 -0800
commit3995f4c5327595b51482bdac8c189736262eb6e0 (patch)
treeef768d0ecf243a2376bfc646b847964313146d3e /arch/arm/configs/h7201_defconfig
parent05814450070f13b671fc9dbf89477677aa0258cb (diff)
parentfe38ea5623d262afc0b92ea47b8a7d8c988521d2 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/configs/h7201_defconfig')
-rw-r--r--arch/arm/configs/h7201_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/h7201_defconfig b/arch/arm/configs/h7201_defconfig
index 39c13a35454..116920aecef 100644
--- a/arch/arm/configs/h7201_defconfig
+++ b/arch/arm/configs/h7201_defconfig
@@ -60,7 +60,6 @@ CONFIG_KMOD=y
# 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