Module Name:    src
Committed By:   jruoho
Date:           Wed Feb 16 08:35:53 UTC 2011

Modified Files:
        src/sys/dev/acpi: acpi_acad.c acpi_button.c acpi_cpu.c acpi_lid.c
            thinkpad_acpi.c
        src/sys/modules/acpiacad: Makefile
        src/sys/modules/acpibut: Makefile
        src/sys/modules/acpicpu: Makefile
        src/sys/modules/acpilid: Makefile
        src/sys/modules/thinkpad: Makefile
Added Files:
        src/sys/modules/acpiacad: acpiacad.ioconf
        src/sys/modules/acpibut: acpibut.ioconf
        src/sys/modules/acpicpu: acpicpu.ioconf
        src/sys/modules/acpilid: acpilid.ioconf
        src/sys/modules/thinkpad: thinkpad.ioconf

Log Message:
Use ioconf for the module declarations.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/acpi/acpi_acad.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/acpi/acpi_button.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/acpi/acpi_cpu.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/acpi/thinkpad_acpi.c
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/acpiacad/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/acpiacad/acpiacad.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/acpibut/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/acpibut/acpibut.ioconf
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/acpicpu/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/acpicpu/acpicpu.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/acpilid/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/acpilid/acpilid.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/thinkpad/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/thinkpad/thinkpad.ioconf

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/acpi/acpi_acad.c
diff -u src/sys/dev/acpi/acpi_acad.c:1.48 src/sys/dev/acpi/acpi_acad.c:1.49
--- src/sys/dev/acpi/acpi_acad.c:1.48	Tue Jan  4 05:48:48 2011
+++ src/sys/dev/acpi/acpi_acad.c	Wed Feb 16 08:35:51 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_acad.c,v 1.48 2011/01/04 05:48:48 jruoho Exp $	*/
+/*	$NetBSD: acpi_acad.c,v 1.49 2011/02/16 08:35:51 jruoho Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.48 2011/01/04 05:48:48 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.49 2011/02/16 08:35:51 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -295,78 +295,38 @@
 	sc->sc_sme = NULL;
 }
 
-#ifdef _MODULE
-
 MODULE(MODULE_CLASS_DRIVER, acpiacad, NULL);
-CFDRIVER_DECL(acpiacad, DV_DULL, NULL);
 
-static int acpiacadloc[] = { -1 };
-extern struct cfattach acpiacad_ca;
-
-static struct cfparent acpiparent = {
-	"acpinodebus", NULL, DVUNIT_ANY
-};
-
-static struct cfdata acpiacad_cfdata[] = {
-	{
-		.cf_name = "acpiacad",
-		.cf_atname = "acpiacad",
-		.cf_unit = 0,
-		.cf_fstate = FSTATE_STAR,
-		.cf_loc = acpiacadloc,
-		.cf_flags = 0,
-		.cf_pspec = &acpiparent,
-	},
-
-	{ NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
 
 static int
-acpiacad_modcmd(modcmd_t cmd, void *context)
+acpiacad_modcmd(modcmd_t cmd, void *aux)
 {
-	int err;
+	int rv = 0;
 
 	switch (cmd) {
 
 	case MODULE_CMD_INIT:
 
-		err = config_cfdriver_attach(&acpiacad_cd);
-
-		if (err != 0)
-			return err;
-
-		err = config_cfattach_attach("acpiacad", &acpiacad_ca);
-
-		if (err != 0) {
-			config_cfdriver_detach(&acpiacad_cd);
-			return err;
-		}
-
-		err = config_cfdata_attach(acpiacad_cfdata, 1);
-
-		if (err != 0) {
-			config_cfattach_detach("acpiacad", &acpiacad_ca);
-			config_cfdriver_detach(&acpiacad_cd);
-			return err;
-		}
-
-		return 0;
+#ifdef _MODULE
+		rv = config_init_component(cfdriver_ioconf_acpiacad,
+		    cfattach_ioconf_acpiacad, cfdata_ioconf_acpiacad);
+#endif
+		break;
 
 	case MODULE_CMD_FINI:
 
-		err = config_cfdata_detach(acpiacad_cfdata);
-
-		if (err != 0)
-			return err;
-
-		config_cfattach_detach("acpiacad", &acpiacad_ca);
-		config_cfdriver_detach(&acpiacad_cd);
-
-		return 0;
+#ifdef _MODULE
+		rv = config_fini_component(cfdriver_ioconf_acpiacad,
+		    cfattach_ioconf_acpiacad, cfdata_ioconf_acpiacad);
+#endif
+		break;
 
 	default:
-		return ENOTTY;
+		rv = ENOTTY;
 	}
-}
 
-#endif	/* _MODULE */
+	return rv;
+}

Index: src/sys/dev/acpi/acpi_button.c
diff -u src/sys/dev/acpi/acpi_button.c:1.39 src/sys/dev/acpi/acpi_button.c:1.40
--- src/sys/dev/acpi/acpi_button.c:1.39	Mon Oct 25 07:48:03 2010
+++ src/sys/dev/acpi/acpi_button.c	Wed Feb 16 08:35:51 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_button.c,v 1.39 2010/10/25 07:48:03 jruoho Exp $	*/
+/*	$NetBSD: acpi_button.c,v 1.40 2011/02/16 08:35:51 jruoho Exp $	*/
 
 /*
  * Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.39 2010/10/25 07:48:03 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.40 2011/02/16 08:35:51 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -191,78 +191,38 @@
 	}
 }
 
-#ifdef _MODULE
-
 MODULE(MODULE_CLASS_DRIVER, acpibut, NULL);
-CFDRIVER_DECL(acpibut, DV_DULL, NULL);
 
-static int acpibutloc[] = { -1 };
-extern struct cfattach acpibut_ca;
-
-static struct cfparent acpiparent = {
-	"acpinodebus", NULL, DVUNIT_ANY
-};
-
-static struct cfdata acpibut_cfdata[] = {
-	{
-		.cf_name = "acpibut",
-		.cf_atname = "acpibut",
-		.cf_unit = 0,
-		.cf_fstate = FSTATE_STAR,
-		.cf_loc = acpibutloc,
-		.cf_flags = 0,
-		.cf_pspec = &acpiparent,
-	},
-
-	{ NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
 
 static int
-acpibut_modcmd(modcmd_t cmd, void *context)
+acpibut_modcmd(modcmd_t cmd, void *aux)
 {
-	int err;
+	int rv = 0;
 
 	switch (cmd) {
 
 	case MODULE_CMD_INIT:
 
-		err = config_cfdriver_attach(&acpibut_cd);
-
-		if (err != 0)
-			return err;
-
-		err = config_cfattach_attach("acpibut", &acpibut_ca);
-
-		if (err != 0) {
-			config_cfdriver_detach(&acpibut_cd);
-			return err;
-		}
-
-		err = config_cfdata_attach(acpibut_cfdata, 1);
-
-		if (err != 0) {
-			config_cfattach_detach("acpibut", &acpibut_ca);
-			config_cfdriver_detach(&acpibut_cd);
-			return err;
-		}
-
-		return 0;
+#ifdef _MODULE
+		rv = config_init_component(cfdriver_ioconf_acpibut,
+		    cfattach_ioconf_acpibut, cfdata_ioconf_acpibut);
+#endif
+		break;
 
 	case MODULE_CMD_FINI:
 
-		err = config_cfdata_detach(acpibut_cfdata);
-
-		if (err != 0)
-			return err;
-
-		config_cfattach_detach("acpibut", &acpibut_ca);
-		config_cfdriver_detach(&acpibut_cd);
-
-		return 0;
+#ifdef _MODULE
+		rv = config_fini_component(cfdriver_ioconf_acpibut,
+		    cfattach_ioconf_acpibut, cfdata_ioconf_acpibut);
+#endif
+		break;
 
 	default:
-		return ENOTTY;
+		rv = ENOTTY;
 	}
-}
 
-#endif	/* _MODULE */
+	return rv;
+}

Index: src/sys/dev/acpi/acpi_cpu.c
diff -u src/sys/dev/acpi/acpi_cpu.c:1.25 src/sys/dev/acpi/acpi_cpu.c:1.26
--- src/sys/dev/acpi/acpi_cpu.c:1.25	Thu Jan 13 04:18:19 2011
+++ src/sys/dev/acpi/acpi_cpu.c	Wed Feb 16 08:35:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.c,v 1.25 2011/01/13 04:18:19 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.c,v 1.26 2011/02/16 08:35:51 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.25 2011/01/13 04:18:19 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.26 2011/02/16 08:35:51 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -628,78 +628,38 @@
 	return true;
 }
 
-#ifdef _MODULE
-
 MODULE(MODULE_CLASS_DRIVER, acpicpu, NULL);
-CFDRIVER_DECL(acpicpu, DV_DULL, NULL);
 
-static int acpicpuloc[] = { -1 };
-extern struct cfattach acpicpu_ca;
-
-static struct cfparent acpiparent = {
-	"acpinodebus", NULL, DVUNIT_ANY
-};
-
-static struct cfdata acpicpu_cfdata[] = {
-	{
-		.cf_name = "acpicpu",
-		.cf_atname = "acpicpu",
-		.cf_unit = 0,
-		.cf_fstate = FSTATE_STAR,
-		.cf_loc = acpicpuloc,
-		.cf_flags = 0,
-		.cf_pspec = &acpiparent,
-	},
-
-	{ NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
 
 static int
-acpicpu_modcmd(modcmd_t cmd, void *context)
+acpicpu_modcmd(modcmd_t cmd, void *aux)
 {
-	int err;
+	int rv = 0;
 
 	switch (cmd) {
 
 	case MODULE_CMD_INIT:
 
-		err = config_cfdriver_attach(&acpicpu_cd);
-
-		if (err != 0)
-			return err;
-
-		err = config_cfattach_attach("acpicpu", &acpicpu_ca);
-
-		if (err != 0) {
-			config_cfdriver_detach(&acpicpu_cd);
-			return err;
-		}
-
-		err = config_cfdata_attach(acpicpu_cfdata, 1);
-
-		if (err != 0) {
-			config_cfattach_detach("acpicpu", &acpicpu_ca);
-			config_cfdriver_detach(&acpicpu_cd);
-			return err;
-		}
-
-		return 0;
+#ifdef _MODULE
+		rv = config_init_component(cfdriver_ioconf_acpicpu,
+		    cfattach_ioconf_acpicpu, cfdata_ioconf_acpicpu);
+#endif
+		break;
 
 	case MODULE_CMD_FINI:
 
-		err = config_cfdata_detach(acpicpu_cfdata);
-
-		if (err != 0)
-			return err;
-
-		config_cfattach_detach("acpicpu", &acpicpu_ca);
-		config_cfdriver_detach(&acpicpu_cd);
-
-		return 0;
+#ifdef _MODULE
+		rv = config_fini_component(cfdriver_ioconf_acpicpu,
+		    cfattach_ioconf_acpicpu, cfdata_ioconf_acpicpu);
+#endif
+		break;
 
 	default:
-		return ENOTTY;
+		rv = ENOTTY;
 	}
-}
 
-#endif	/* _MODULE */
+	return rv;
+}

Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.42 src/sys/dev/acpi/acpi_lid.c:1.43
--- src/sys/dev/acpi/acpi_lid.c:1.42	Mon Oct 25 07:48:03 2010
+++ src/sys/dev/acpi/acpi_lid.c	Wed Feb 16 08:35:51 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_lid.c,v 1.42 2010/10/25 07:48:03 jruoho Exp $	*/
+/*	$NetBSD: acpi_lid.c,v 1.43 2011/02/16 08:35:51 jruoho Exp $	*/
 
 /*
  * Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.42 2010/10/25 07:48:03 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.43 2011/02/16 08:35:51 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -173,78 +173,38 @@
 	}
 }
 
-#ifdef _MODULE
-
 MODULE(MODULE_CLASS_DRIVER, acpilid, NULL);
-CFDRIVER_DECL(acpilid, DV_DULL, NULL);
 
-static int acpilidloc[] = { -1 };
-extern struct cfattach acpilid_ca;
-
-static struct cfparent acpiparent = {
-	"acpinodebus", NULL, DVUNIT_ANY
-};
-
-static struct cfdata acpilid_cfdata[] = {
-	{
-		.cf_name = "acpilid",
-		.cf_atname = "acpilid",
-		.cf_unit = 0,
-		.cf_fstate = FSTATE_STAR,
-		.cf_loc = acpilidloc,
-		.cf_flags = 0,
-		.cf_pspec = &acpiparent,
-	},
-
-	{ NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
 
 static int
-acpilid_modcmd(modcmd_t cmd, void *context)
+acpilid_modcmd(modcmd_t cmd, void *aux)
 {
-	int err;
+	int rv = 0;
 
 	switch (cmd) {
 
 	case MODULE_CMD_INIT:
 
-		err = config_cfdriver_attach(&acpilid_cd);
-
-		if (err != 0)
-			return err;
-
-		err = config_cfattach_attach("acpilid", &acpilid_ca);
-
-		if (err != 0) {
-			config_cfdriver_detach(&acpilid_cd);
-			return err;
-		}
-
-		err = config_cfdata_attach(acpilid_cfdata, 1);
-
-		if (err != 0) {
-			config_cfattach_detach("acpilid", &acpilid_ca);
-			config_cfdriver_detach(&acpilid_cd);
-			return err;
-		}
-
-		return 0;
+#ifdef _MODULE
+		rv = config_init_component(cfdriver_ioconf_acpilid,
+		    cfattach_ioconf_acpilid, cfdata_ioconf_acpilid);
+#endif
+		break;
 
 	case MODULE_CMD_FINI:
 
-		err = config_cfdata_detach(acpilid_cfdata);
-
-		if (err != 0)
-			return err;
-
-		config_cfattach_detach("acpilid", &acpilid_ca);
-		config_cfdriver_detach(&acpilid_cd);
-
-		return 0;
+#ifdef _MODULE
+		rv = config_fini_component(cfdriver_ioconf_acpilid,
+		    cfattach_ioconf_acpilid, cfdata_ioconf_acpilid);
+#endif
+		break;
 
 	default:
-		return ENOTTY;
+		rv = ENOTTY;
 	}
-}
 
-#endif	/* _MODULE */
+	return rv;
+}

Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.33 src/sys/dev/acpi/thinkpad_acpi.c:1.34
--- src/sys/dev/acpi/thinkpad_acpi.c:1.33	Tue Jan 18 18:56:25 2011
+++ src/sys/dev/acpi/thinkpad_acpi.c	Wed Feb 16 08:35:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.33 2011/01/18 18:56:25 jmcneill Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.34 2011/02/16 08:35:51 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.33 2011/01/18 18:56:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.34 2011/02/16 08:35:51 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -647,78 +647,38 @@
 	return true;
 }
 
-#ifdef _MODULE
-
 MODULE(MODULE_CLASS_DRIVER, thinkpad, NULL);
-CFDRIVER_DECL(thinkpad, DV_DULL, NULL);
-
-static int thinkpadloc[] = { -1 };
-extern struct cfattach thinkpad_ca;
-
-static struct cfparent acpiparent = {
-	"acpinodebus", NULL, DVUNIT_ANY
-};
-
-static struct cfdata thinkpad_cfdata[] = {
-	{
-		.cf_name = "thinkpad",
-		.cf_atname = "thinkpad",
-		.cf_unit = 0,
-		.cf_fstate = FSTATE_STAR,
-		.cf_loc = thinkpadloc,
-		.cf_flags = 0,
-		.cf_pspec = &acpiparent,
-	},
 
-	{ NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
 
 static int
-thinkpad_modcmd(modcmd_t cmd, void *opaque)
+thinkpad_modcmd(modcmd_t cmd, void *aux)
 {
-	int err;
+	int rv = 0;
 
 	switch (cmd) {
 
 	case MODULE_CMD_INIT:
 
-		err = config_cfdriver_attach(&thinkpad_cd);
-
-		if (err != 0)
-			return err;
-
-		err = config_cfattach_attach("thinkpad", &thinkpad_ca);
-
-		if (err != 0) {
-			config_cfdriver_detach(&thinkpad_cd);
-			return err;
-		}
-
-		err = config_cfdata_attach(thinkpad_cfdata, 1);
-
-		if (err != 0) {
-			config_cfattach_detach("thinkpad", &thinkpad_ca);
-			config_cfdriver_detach(&thinkpad_cd);
-			return err;
-		}
-
-		return 0;
+#ifdef _MODULE
+		rv = config_init_component(cfdriver_ioconf_thinkpad,
+		    cfattach_ioconf_thinkpad, cfdata_ioconf_thinkpad);
+#endif
+		break;
 
 	case MODULE_CMD_FINI:
 
-		err = config_cfdata_detach(thinkpad_cfdata);
-
-		if (err != 0)
-			return err;
-
-		config_cfattach_detach("thinkpad", &thinkpad_ca);
-		config_cfdriver_detach(&thinkpad_cd);
-
-		return 0;
+#ifdef _MODULE
+		rv = config_fini_component(cfdriver_ioconf_thinkpad,
+		    cfattach_ioconf_thinkpad, cfdata_ioconf_thinkpad);
+#endif
+		break;
 
 	default:
-		return ENOTTY;
+		rv = ENOTTY;
 	}
-}
 
-#endif	/* _MODULE */
+	return rv;
+}

Index: src/sys/modules/acpiacad/Makefile
diff -u src/sys/modules/acpiacad/Makefile:1.2 src/sys/modules/acpiacad/Makefile:1.3
--- src/sys/modules/acpiacad/Makefile:1.2	Mon Oct 25 07:48:04 2010
+++ src/sys/modules/acpiacad/Makefile	Wed Feb 16 08:35:51 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:04 jruoho Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/16 08:35:51 jruoho Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/dev/acpi
 
 KMOD=	acpiacad
+IOCONF=	acpiacad.ioconf
 SRCS=	acpi_acad.c
 
 WARNS=	4

Index: src/sys/modules/acpibut/Makefile
diff -u src/sys/modules/acpibut/Makefile:1.2 src/sys/modules/acpibut/Makefile:1.3
--- src/sys/modules/acpibut/Makefile:1.2	Mon Oct 25 07:48:04 2010
+++ src/sys/modules/acpibut/Makefile	Wed Feb 16 08:35:52 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:04 jruoho Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/16 08:35:52 jruoho Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/dev/acpi
 
 KMOD=	acpibut
+IOCONF=	acpibut.ioconf
 SRCS=	acpi_button.c
 
 WARNS=	4

Index: src/sys/modules/acpicpu/Makefile
diff -u src/sys/modules/acpicpu/Makefile:1.5 src/sys/modules/acpicpu/Makefile:1.6
--- src/sys/modules/acpicpu/Makefile:1.5	Thu Dec 30 18:38:50 2010
+++ src/sys/modules/acpicpu/Makefile	Wed Feb 16 08:35:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/30 18:38:50 jruoho Exp $
+# $NetBSD: Makefile,v 1.6 2011/02/16 08:35:52 jruoho Exp $
 
 .include "../Makefile.inc"
 
@@ -6,6 +6,7 @@
 .PATH:	${S}/arch/x86/acpi
 
 KMOD=	acpicpu
+IOCONF=	acpicpu.ioconf
 SRCS=	acpi_cpu.c \
 	acpi_cpu_md.c \
 	acpi_cpu_cstate.c \

Index: src/sys/modules/acpilid/Makefile
diff -u src/sys/modules/acpilid/Makefile:1.2 src/sys/modules/acpilid/Makefile:1.3
--- src/sys/modules/acpilid/Makefile:1.2	Mon Oct 25 07:48:03 2010
+++ src/sys/modules/acpilid/Makefile	Wed Feb 16 08:35:52 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:03 jruoho Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/16 08:35:52 jruoho Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/dev/acpi
 
 KMOD=	acpilid
+IOCONF=	acpilid.ioconf
 SRCS=	acpi_lid.c
 
 WARNS=	4

Index: src/sys/modules/thinkpad/Makefile
diff -u src/sys/modules/thinkpad/Makefile:1.2 src/sys/modules/thinkpad/Makefile:1.3
--- src/sys/modules/thinkpad/Makefile:1.2	Mon Oct 25 07:48:04 2010
+++ src/sys/modules/thinkpad/Makefile	Wed Feb 16 08:35:52 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:04 jruoho Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/16 08:35:52 jruoho Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/dev/acpi
 
 KMOD=	thinkpad
+IOCONF=	thinkpad.ioconf
 SRCS=	thinkpad_acpi.c
 
 WARNS=	4

Added files:

Index: src/sys/modules/acpiacad/acpiacad.ioconf
diff -u /dev/null src/sys/modules/acpiacad/acpiacad.ioconf:1.1
--- /dev/null	Wed Feb 16 08:35:53 2011
+++ src/sys/modules/acpiacad/acpiacad.ioconf	Wed Feb 16 08:35:51 2011
@@ -0,0 +1,10 @@
+# $NetBSD: acpiacad.ioconf,v 1.1 2011/02/16 08:35:51 jruoho Exp $
+
+ioconf acpiacad
+
+include "conf/files"
+include "dev/acpi/files.acpi"
+
+pseudo-root acpi*
+
+acpiacad* at acpi?

Index: src/sys/modules/acpibut/acpibut.ioconf
diff -u /dev/null src/sys/modules/acpibut/acpibut.ioconf:1.1
--- /dev/null	Wed Feb 16 08:35:53 2011
+++ src/sys/modules/acpibut/acpibut.ioconf	Wed Feb 16 08:35:52 2011
@@ -0,0 +1,10 @@
+# $NetBSD: acpibut.ioconf,v 1.1 2011/02/16 08:35:52 jruoho Exp $
+
+ioconf acpibut
+
+include "conf/files"
+include "dev/acpi/files.acpi"
+
+pseudo-root acpi*
+
+acpibut* at acpi?

Index: src/sys/modules/acpicpu/acpicpu.ioconf
diff -u /dev/null src/sys/modules/acpicpu/acpicpu.ioconf:1.1
--- /dev/null	Wed Feb 16 08:35:53 2011
+++ src/sys/modules/acpicpu/acpicpu.ioconf	Wed Feb 16 08:35:52 2011
@@ -0,0 +1,10 @@
+# $NetBSD: acpicpu.ioconf,v 1.1 2011/02/16 08:35:52 jruoho Exp $
+
+ioconf acpicpu
+
+include "conf/files"
+include "dev/acpi/files.acpi"
+
+pseudo-root acpi*
+
+acpicpu* at acpi?

Index: src/sys/modules/acpilid/acpilid.ioconf
diff -u /dev/null src/sys/modules/acpilid/acpilid.ioconf:1.1
--- /dev/null	Wed Feb 16 08:35:53 2011
+++ src/sys/modules/acpilid/acpilid.ioconf	Wed Feb 16 08:35:52 2011
@@ -0,0 +1,10 @@
+# $NetBSD: acpilid.ioconf,v 1.1 2011/02/16 08:35:52 jruoho Exp $
+
+ioconf acpilid
+
+include "conf/files"
+include "dev/acpi/files.acpi"
+
+pseudo-root acpi*
+
+acpilid* at acpi?

Index: src/sys/modules/thinkpad/thinkpad.ioconf
diff -u /dev/null src/sys/modules/thinkpad/thinkpad.ioconf:1.1
--- /dev/null	Wed Feb 16 08:35:53 2011
+++ src/sys/modules/thinkpad/thinkpad.ioconf	Wed Feb 16 08:35:52 2011
@@ -0,0 +1,10 @@
+# $NetBSD: thinkpad.ioconf,v 1.1 2011/02/16 08:35:52 jruoho Exp $
+
+ioconf thinkpad
+
+include "conf/files"
+include "dev/acpi/files.acpi"
+
+pseudo-root acpi*
+
+thinkpad* at acpi?

Reply via email to