Kill constructs inherited from old config(8), which are no longer
necessary since conditionals in the various files.foo will make sure
these files won't get compiled if the requirements are not met.
Index: sys/arch/amd64/amd64/acpi_wakecode.S
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/acpi_wakecode.S,v
retrieving revision 1.11
diff -u -p -r1.11 acpi_wakecode.S
--- sys/arch/amd64/amd64/acpi_wakecode.S 1 Jul 2010 01:02:31 -0000
1.11
+++ sys/arch/amd64/amd64/acpi_wakecode.S 11 Nov 2010 09:47:48 -0000
@@ -41,11 +41,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "acpi.h"
-
-#if NACPI > 0
-#ifndef SMALL_KERNEL
-
#define _ACPI_WAKECODE
#include "assym.h"
@@ -630,5 +625,3 @@ NENTRY(acpi_savecpu)
movl $1, %eax
ret
-#endif /* SMALL_KERNEL */
-#endif /* NACPI > 0 */
Index: sys/arch/i386/i386/acpi_wakecode.S
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/acpi_wakecode.S,v
retrieving revision 1.10
diff -u -p -r1.10 acpi_wakecode.S
--- sys/arch/i386/i386/acpi_wakecode.S 1 Jul 2010 01:02:31 -0000 1.10
+++ sys/arch/i386/i386/acpi_wakecode.S 11 Nov 2010 09:47:55 -0000
@@ -40,11 +40,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "acpi.h"
-
-#if NACPI > 0
-#ifndef SMALL_KERNEL
-
#define _ACPI_WAKECODE
#include "assym.h"
@@ -480,5 +475,3 @@ NENTRY(acpi_savecpu)
movl $1, %eax
ret
-#endif /* SMALL_KERNEL */
-#endif /* NACPI > 0 */
Index: sys/arch/vax/uba/qv.c
===================================================================
RCS file: /cvs/src/sys/arch/vax/uba/qv.c,v
retrieving revision 1.15
diff -u -p -r1.15 qv.c
--- sys/arch/vax/uba/qv.c 26 Jun 2010 23:24:44 -0000 1.15
+++ sys/arch/vax/uba/qv.c 11 Nov 2010 09:48:16 -0000
@@ -119,14 +119,11 @@
* virtual system console. This code runs before and during auto-
* configuration and therefore is require to have a second path for setup.
* It is further constrained to have a character output routine that
* is not dependant on the interrupt system.
*
*/
-#include "qv.h"
-#if NQV > 0
-
#include <machine/pte.h>
#include <sys/param.h>
@@ -152,7 +149,6 @@ struct uba_device *qvinfo[NQV];
struct tty qv_tty[NQV*4];
-#define nNQV NQV
int nqv = NQV*4;
/*
@@ -1312,4 +1308,3 @@ int probed;
qvaddr->qv_csr |= QV_VIDEO_ENA ;
return 1;
}
-#endif
Index: sys/dev/audio.c
===================================================================
RCS file: /cvs/src/sys/dev/audio.c,v
retrieving revision 1.110
diff -u -p -r1.110 audio.c
--- sys/dev/audio.c 21 Sep 2010 20:08:11 -0000 1.110
+++ sys/dev/audio.c 11 Nov 2010 09:48:18 -0000
@@ -61,9 +61,6 @@
* and silence fill.
*/
-#include "audio.h"
-#if NAUDIO > 0
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/fcntl.h>
@@ -536,7 +533,6 @@ audio_attach_mi(struct audio_hw_if *ahwp
return config_found(dev, &arg, audioprint);
}
-#if NAUDIO > 0
int
audioprint(void *aux, const char *pnp)
{
@@ -562,8 +558,6 @@ audioprint(void *aux, const char *pnp)
return (UNCONF);
}
-#endif /* NAUDIO > 0 */
-
#ifdef AUDIO_DEBUG
void audio_printsc(struct audio_softc *);
void audio_print_params(char *, struct audio_params *);
@@ -3296,7 +3290,6 @@ mixer_ioctl(dev_t dev, u_long cmd, caddr
IOCPARM_LEN(cmd), IOCGROUP(cmd), cmd&0xff, error));
return (error);
}
-#endif
int
audiokqfilter(dev_t dev, struct knote *kn)
@@ -3363,7 +3356,7 @@ filt_audiowrite(struct knote *kn, long h
return AUDIO_FILTWRITE(sc);
}
-#if NAUDIO > 0 && NWSKBD > 0
+#if NWSKBD > 0
int
wskbd_set_mixervolume(long dir)
{
@@ -3429,4 +3422,4 @@ wskbd_set_mixervolume(long dir)
return (0);
}
-#endif /* NAUDIO > 0 && NWSKBD > 0 */
+#endif /* NWSKBD > 0 */
Index: sys/dev/midi.c
===================================================================
RCS file: /cvs/src/sys/dev/midi.c,v
retrieving revision 1.22
diff -u -p -r1.22 midi.c
--- sys/dev/midi.c 8 Apr 2010 01:48:24 -0000 1.22
+++ sys/dev/midi.c 11 Nov 2010 09:48:18 -0000
@@ -24,9 +24,7 @@
* need this driver
*/
-#include "midi.h"
#include "sequencer.h"
-#if NMIDI > 0
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -759,4 +757,3 @@ midi_writebytes(int unit, unsigned char
}
#endif /* NSEQUENCER > 0 */
-#endif /* NMIDI > 0 */
Index: sys/dev/sequencer.c
===================================================================
RCS file: /cvs/src/sys/dev/sequencer.c,v
retrieving revision 1.19
diff -u -p -r1.19 sequencer.c
--- sys/dev/sequencer.c 9 Nov 2009 17:53:39 -0000 1.19
+++ sys/dev/sequencer.c 11 Nov 2010 09:48:18 -0000
@@ -30,9 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "sequencer.h"
-#if NSEQUENCER > 0
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/fcntl.h>
@@ -1283,6 +1280,3 @@ midi_writebytes(int unit, u_char *buf, i
return (ENXIO);
}
#endif /* NMIDI == 0 */
-
-#endif /* NSEQUENCER > 0 */
-
Index: sys/dev/eisa/ahc_eisa.c
===================================================================
RCS file: /cvs/src/sys/dev/eisa/ahc_eisa.c,v
retrieving revision 1.19
diff -u -p -r1.19 ahc_eisa.c
--- sys/dev/eisa/ahc_eisa.c 29 Mar 2009 21:53:52 -0000 1.19
+++ sys/dev/eisa/ahc_eisa.c 11 Nov 2010 09:48:19 -0000
@@ -35,9 +35,6 @@
* $Id: ahc_eisa.c,v 1.19 2009/03/29 21:53:52 sthen Exp $
*/
-#include "eisa.h"
-#if NEISA > 0
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -327,4 +324,3 @@ void *aux;
ahc_attach(ahc);
}
-#endif /* NEISA > 0 */
Index: sys/dev/ic/cy.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/cy.c,v
retrieving revision 1.32
diff -u -p -r1.32 cy.c
--- sys/dev/ic/cy.c 2 Jul 2010 17:27:01 -0000 1.32
+++ sys/dev/ic/cy.c 11 Nov 2010 09:48:21 -0000
@@ -50,10 +50,6 @@
*
*/
-/* NCY is the number of Cyclom cards in the machine */
-#include "cy.h"
-#if NCY > 0
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -1418,5 +1414,3 @@ cy_speed(speed_t speed, int *cor, int *b
return (-1);
}
-
-#endif /* NCY > 0 */
