diff options
| author | njl <njl@FreeBSD.org> | 2002-09-11 05:33:15 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2002-09-11 05:33:15 +0000 |
| commit | b6c4bef8cf8b0501677c43c7e149cbaabeaa41f1 (patch) | |
| tree | e78f15cb72a86cb872b210b00aca637d646011e7 | |
| parent | 57d52b441f615390566afb0c89cf1ff438b87639 (diff) | |
| download | FreeBSD-src-b6c4bef8cf8b0501677c43c7e149cbaabeaa41f1.zip FreeBSD-src-b6c4bef8cf8b0501677c43c7e149cbaabeaa41f1.tar.gz | |
Fix LINT build on alpha by completing move of cy and apm_saver to
i386/conf/NOTES rather than the global conf/NOTES.
Suggested by: bde
| -rw-r--r-- | sys/conf/NOTES | 7 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a7d41d0..b2bf7ab 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1052,7 +1052,6 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev device splash # Splash screen and screen saver support # Various screen savers. -device apm_saver # Requires APM device blank_saver device daemon_saver device fade_saver @@ -1848,12 +1847,6 @@ hint.gusc.0.flags="0x13" device joy # PnP aware, hints for nonpnp only hint.joy.0.at="isa" hint.joy.0.port="0x201" -device cy 1 -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared -hint.cy.0.at="isa" -hint.cy.0.irq="10" -hint.cy.0.maddr="0xd4000" -hint.cy.0.msize="0x2000" device dgb 1 options NDGBPORTS=17 hint.dgb.0.at="isa" diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index aef286b..bf39d72 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -236,6 +236,7 @@ options CLK_USE_TSC_CALIBRATION device speaker #Play IBM BASIC-style noises out your speaker device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT! +device apm_saver # Requires APM ##################################################################### @@ -757,6 +758,15 @@ options COMPAQ_M610 # PCI bus Cards: # -------------- # +# Cyclades Cyclom-Y PCI serial driver +device cy 1 +options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +hint.cy.0.at="isa" +hint.cy.0.irq="10" +hint.cy.0.maddr="0xd4000" +hint.cy.0.msize="0x2000" +# +#--------------------------------------------------------------------------- # ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI) options ELSA_QS1PCI # |
