summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/pleb_defconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-05-08 18:29:27 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-05-08 18:29:27 -0700
commitd585a021c0b10b0477d6b608c53e1feb8cde0507 (patch)
tree5ca059da1db7f15d4b29427644ad9c08270c885c /arch/arm/configs/pleb_defconfig
parent84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff)
parent091bf7624d1c90cec9e578a18529f615213ff847 (diff)
downloadblackbird-op-linux-d585a021c0b10b0477d6b608c53e1feb8cde0507.tar.gz
blackbird-op-linux-d585a021c0b10b0477d6b608c53e1feb8cde0507.zip
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'arch/arm/configs/pleb_defconfig')
-rw-r--r--arch/arm/configs/pleb_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/pleb_defconfig b/arch/arm/configs/pleb_defconfig
index a6b47ea8e465..f2d2dda25949 100644
--- a/arch/arm/configs/pleb_defconfig
+++ b/arch/arm/configs/pleb_defconfig
@@ -88,7 +88,6 @@ CONFIG_ARCH_SA1100=y
# CONFIG_SA1100_COLLIE is not set
# CONFIG_SA1100_H3100 is not set
# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_H3800 is not set
# CONFIG_SA1100_BADGE4 is not set
# CONFIG_SA1100_JORNADA720 is not set
# CONFIG_SA1100_HACKKIT is not set
OpenPOWER on IntegriCloud