From c1a7ea14a3f241c7c91554f52f0459943154c208 Mon Sep 17 00:00:00 2001
From: tsubai <tsubai@NetBSD.org>
Date: Fri, 15 Oct 1999 07:55:08 +0000
Subject: [PATCH] Add cardbus support.

---
 sys/arch/macppc/conf/GENERIC | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index afb6586b39f4..3c806bef2d0b 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,6 +1,6 @@
-#	$NetBSD: GENERIC,v 1.37 1999/09/19 22:02:38 matt Exp $
+#	$NetBSD: GENERIC,v 1.38 1999/10/15 07:55:08 tsubai Exp $
 #
-# POWERMAC config file
+#	GENERIC -- everything that's currently supported
 #
 
 include		"arch/macppc/conf/std.macppc"
@@ -120,8 +120,9 @@ bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
 pcscp*	at pci? dev ? function ?	# AMD Am53c974 PCscsi-PCI SCSI
 ofb*	at pci? dev ? function ?	# Generic Open Firmware Framebuffer
 pciide*	at pci? dev ? function ?
-#macofcons0 at pci? dev ? function ?	# OpenFirmware console (for debugging)
+cbb*	at pci? dev? function ?		# PCI-CardBus bridge
 obio0	at pci? dev ? function ?
+#macofcons0 at pci? dev ? function ?	# OpenFirmware console (for debugging)
 
 nsphy*	at mii? phy ?			# NS83840 PHYs
 
@@ -139,6 +140,17 @@ zstty*	at zsc? channel ?
 mediabay* at obio?
 wdc*	at mediabay? flags 0
 
+cardslot* at cbb?
+cardbus* at cardslot?
+pcmcia*	at cardslot?
+
+#com*	at pcmcia? function ?		# Modems and serial cards
+wdc*	at pcmcia? function ?		# PCMCIA IDE controllers
+ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
+mbe*	at pcmcia? function ?		# MB8696x based Ethernet
+ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
+ex*	at cardbus?			# 3Com 3C575TX
+
 wsdisplay0 at ofb? console ?
 wskbd0	at akbd? console ?
 wsmouse0 at ams? mux 0