From 529c593ece216e4aaffd36bd940cb94f1fa63129 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 23 Feb 2000 00:40:54 +0000
Subject: Merge with 2.3.43.  I did ignore all modifications to the qlogicisp.c
 driver due to the Origin A64 hacks.

---
 arch/arm/def-configs/a5k | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'arch/arm/def-configs/a5k')

diff --git a/arch/arm/def-configs/a5k b/arch/arm/def-configs/a5k
index b5fd4b315..21a6488eb 100644
--- a/arch/arm/def-configs/a5k
+++ b/arch/arm/def-configs/a5k
@@ -167,6 +167,11 @@ CONFIG_MOUSE=y
 # CONFIG_FTAPE is not set
 # CONFIG_DRM is not set
 # CONFIG_DRM_TDFX is not set
+
+#
+# PCMCIA character device support
+#
+# CONFIG_PCMCIA_SERIAL_CS is not set
 # CONFIG_AGP is not set
 
 #
@@ -323,6 +328,11 @@ CONFIG_ARM_ETHER3=y
 #
 # CONFIG_WAN is not set
 
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
 #
 # SCSI support
 #
-- 
cgit v1.2.3