Module Name: src
Committed By: jmcneill
Date: Tue Dec 28 00:11:50 UTC 2010
Modified Files:
src/sys/dev/i2c: au8522.c xc5k.c
src/sys/dev/usb: auvitek.c
Log Message:
don't make module declaration conditional on _MODULE
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/au8522.c src/sys/dev/i2c/xc5k.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/auvitek.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/au8522.c
diff -u src/sys/dev/i2c/au8522.c:1.1 src/sys/dev/i2c/au8522.c:1.2
--- src/sys/dev/i2c/au8522.c:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/i2c/au8522.c Tue Dec 28 00:11:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: au8522.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: au8522.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au8522.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au8522.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -257,8 +257,6 @@
return (status & AU8522_STATUS_LOCK) == AU8522_STATUS_LOCK ? 1 : 0;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, au8522, NULL);
static int
@@ -273,5 +271,3 @@
return ENOTTY;
}
}
-
-#endif /* !_MODULE */
Index: src/sys/dev/i2c/xc5k.c
diff -u src/sys/dev/i2c/xc5k.c:1.1 src/sys/dev/i2c/xc5k.c:1.2
--- src/sys/dev/i2c/xc5k.c:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/i2c/xc5k.c Tue Dec 28 00:11:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xc5k.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: xc5k.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xc5k.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xc5k.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -322,8 +322,6 @@
return 0;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, xc5k, NULL);
static int
@@ -340,5 +338,3 @@
return ENOTTY;
}
}
-
-#endif /* !_MODULE */
Index: src/sys/dev/usb/auvitek.c
diff -u src/sys/dev/usb/auvitek.c:1.1 src/sys/dev/usb/auvitek.c:1.2
--- src/sys/dev/usb/auvitek.c:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/usb/auvitek.c Tue Dec 28 00:11:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: auvitek.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvitek.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -285,25 +285,31 @@
usbd_errstr(err));
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, auvitek, "au8522,xc5k");
+#ifdef _MODULE
#include "ioconf.c"
+#endif
static int
auvitek_modcmd(modcmd_t cmd, void *opaque)
{
switch (cmd) {
case MODULE_CMD_INIT:
+#ifdef _MODULE
return config_init_component(cfdriver_ioconf_auvitek,
cfattach_ioconf_auvitek, cfdata_ioconf_auvitek);
+#else
+ return 0;
+#endif
case MODULE_CMD_FINI:
+#ifdef _MODULE
return config_fini_component(cfdriver_ioconf_auvitek,
cfattach_ioconf_auvitek, cfdata_ioconf_auvitek);
+#else
+ return 0;
+#endif
default:
return ENOTTY;
}
}
-
-#endif /* !_MODULE */
