diff options
| author | peter <peter@FreeBSD.org> | 1999-12-06 18:17:42 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-12-06 18:17:42 +0000 |
| commit | 386c6276bceb7c5704ebd845760d666902ae35d9 (patch) | |
| tree | e0a4a7f9ebe0d9e31aa9a45a3d08f96a19d3a20b /sys/i386 | |
| parent | 3524c347b0116f7aab8ec44dc98068df93459f3a (diff) | |
| download | FreeBSD-src-386c6276bceb7c5704ebd845760d666902ae35d9.zip FreeBSD-src-386c6276bceb7c5704ebd845760d666902ae35d9.tar.gz | |
Fold the pnp code into the base isa system to pave the way for PNPBIOS.
Reviewed by: dfr (a few weeks ago)
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/GENERIC | 1 | ||||
| -rw-r--r-- | sys/i386/conf/LINT | 8 | ||||
| -rw-r--r-- | sys/i386/conf/NEWCARD | 1 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 8 | ||||
| -rw-r--r-- | sys/i386/conf/PCCARD | 1 |
5 files changed, 4 insertions, 15 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index de1d1b5..4c4dcb1 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -59,7 +59,6 @@ options SYSVSEM #SYSV-style semaphores #options NINTR=24 # number of INTs controller isa0 -controller pnp0 # PnP support for ISA controller eisa0 controller pci0 diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index c52b4c1..db2f541 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -900,11 +900,6 @@ options PPS_SYNC options NTIMECOUNTER=20 -# Enable PnP support in the kernel. This allows you to automatically -# attach to PnP cards for drivers that support it and allows you to -# configure cards from USERCONFIG. See pnp(4) for more info. -controller pnp0 - # The keyboard controller; it controls the keyboard and the PS/2 mouse. controller atkbdc0 at isa? port IO_KBD @@ -1407,7 +1402,8 @@ device uart0 at isa? port 0x330 irq 5 # The newpcm driver (use INSTEAD of snd0 and all VOXWARE drivers!). # You may also wish to enable the pnp controller with this, for pnp -# sound cards. +# sound cards. Note that motherboard sound devices may require +# options PNPBIOS. # # For non-pnp sound cards only: #device pcm0 at isa? port ? irq 10 drq 1 flags 0x0 diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD index bae4f12..143940e 100644 --- a/sys/i386/conf/NEWCARD +++ b/sys/i386/conf/NEWCARD @@ -68,7 +68,6 @@ options SYSVSEM #SYSV-style semaphores #options NINTR=24 # number of INTs controller isa0 -controller pnp0 # PnP support for ISA controller eisa0 controller pci0 controller pccard0 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index c52b4c1..db2f541 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -900,11 +900,6 @@ options PPS_SYNC options NTIMECOUNTER=20 -# Enable PnP support in the kernel. This allows you to automatically -# attach to PnP cards for drivers that support it and allows you to -# configure cards from USERCONFIG. See pnp(4) for more info. -controller pnp0 - # The keyboard controller; it controls the keyboard and the PS/2 mouse. controller atkbdc0 at isa? port IO_KBD @@ -1407,7 +1402,8 @@ device uart0 at isa? port 0x330 irq 5 # The newpcm driver (use INSTEAD of snd0 and all VOXWARE drivers!). # You may also wish to enable the pnp controller with this, for pnp -# sound cards. +# sound cards. Note that motherboard sound devices may require +# options PNPBIOS. # # For non-pnp sound cards only: #device pcm0 at isa? port ? irq 10 drq 1 flags 0x0 diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD index b8bb803..311bece 100644 --- a/sys/i386/conf/PCCARD +++ b/sys/i386/conf/PCCARD @@ -60,7 +60,6 @@ options SYSVSEM #SYSV-style semaphores #options NINTR=24 # number of INTs controller isa0 -controller pnp0 # PnP support for ISA controller eisa0 controller pci0 |
