diff options
| author | Warner Losh <imp@FreeBSD.org> | 2000-01-10 02:29:23 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2000-01-10 02:29:23 +0000 |
| commit | 89ce66ed87d75f3693df8548e6e16ab725689c12 (patch) | |
| tree | b5549d86add8125c11eb5b43d44f7da4f2d8ec58 | |
| parent | 4ee074718be3f847292eea11bbdaa50751fa673c (diff) | |
| download | src-89ce66ed87d75f3693df8548e6e16ab725689c12.tar.gz src-89ce66ed87d75f3693df8548e6e16ab725689c12.zip | |
Uncomment pcic device and put pccard in GENERIC. PCCARD will be removed
in a little while as soon as I find all the places it is used in the
tree.
Notes
Notes:
svn path=/head/; revision=55701
| -rw-r--r-- | sys/amd64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 55ad45158416..011fb9079f11 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -134,9 +134,9 @@ device npx0 at nexus? port IO_NPX irq 13 device apm0 at nexus? disable flags 0x20 # Advanced Power Management # PCCARD (PCMCIA) support -#device card0 -#device pcic0 at isa? -#device pcic1 at isa? +device card0 +device pcic0 at isa? irq 10 port 0x3e0 iomem 0xd0000 +device pcic1 at isa? irq 11 port 0x3e2 iomem 0xd4000 disable # Serial (COM) ports device sio0 at isa? port IO_COM1 flags 0x10 irq 4 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 55ad45158416..011fb9079f11 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -134,9 +134,9 @@ device npx0 at nexus? port IO_NPX irq 13 device apm0 at nexus? disable flags 0x20 # Advanced Power Management # PCCARD (PCMCIA) support -#device card0 -#device pcic0 at isa? -#device pcic1 at isa? +device card0 +device pcic0 at isa? irq 10 port 0x3e0 iomem 0xd0000 +device pcic1 at isa? irq 11 port 0x3e2 iomem 0xd4000 disable # Serial (COM) ports device sio0 at isa? port IO_COM1 flags 0x10 irq 4 |