diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2007-08-05 17:01:26 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2007-08-05 17:01:26 +0000 |
| commit | 5ad64e242e3fda6dbfa861b5c0ba5693c8a594dd (patch) | |
| tree | 0b3fe9c176c00691c4dadb95bb50674b647aa869 | |
| parent | 3cb1bb925c9c06ee5a299267a99ecb386b048a2d (diff) | |
Enable Compact Flash driver for the Marvell 88W8385 chip in
zaurus, amd64, and i386 GENERIC.
OK claudio@, deraadt@
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/GENERIC | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 9dee2884aa3..d5c81a029be 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.190 2007/08/02 16:40:27 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.191 2007/08/05 17:01:25 mglocker Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -411,6 +411,7 @@ pgt* at pci? # Prism54 (only full-mac varients) pgt* at cardbus? # Prism54 (only full-mac varients) malo* at pci? # Marvell Libertas malo* at cardbus? # Marvell Libertas +malo* at pcmcia? # Marvell 88W8385 # Media Independent Interface (mii) drivers exphy* at mii? # 3Com internal PHYs diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index c541c040c8c..796880e86d6 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.567 2007/07/02 14:29:37 dlg Exp $ +# $OpenBSD: GENERIC,v 1.568 2007/08/05 17:01:25 mglocker Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -561,6 +561,7 @@ pgt* at pci? # Prism54 (only full-mac varients) pgt* at cardbus? # Prism54 (only full-mac varients) malo* at pci? # Marvell Libertas malo* at cardbus? # Marvell Libertas +malo* at pcmcia? # Marvell 88W8385 mbg* at pci? # Meinberg Funkuhren radio clocks # Media Independent Interface (mii) drivers diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index 0ba528a10e9..1d39226e255 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.64 2007/05/31 23:18:25 uwe Exp $ +# $OpenBSD: GENERIC,v 1.65 2007/08/05 17:01:25 mglocker Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -156,6 +156,7 @@ pcmcia* at pxapcic? # PCMCIA (CF) devices com* at pcmcia? # PCMCIA modems/serial ports wi* at pcmcia? # WaveLAN IEEE 802.11DS +malo* at pcmcia? # Marvell 88W8385 ne* at pcmcia? # PCMCIA based NE2000 ethernet wdc* at pcmcia? # hard disk controller #cfxga* at pcmcia? # VoyagerVGA frame buffer |