From f2b8ed7ad8411eae8dfd0af4fa28ed726c48dd89 Mon Sep 17 00:00:00 2001
From: mbalmer <mbalmer@NetBSD.org>
Date: Sun, 2 Oct 2011 12:13:08 +0000
Subject: [PATCH] Build iic(4) and gpioiic(4) as modules.

---
 distrib/sets/lists/modules/md.evbppc | 10 +++++++++-
 distrib/sets/lists/modules/mi        |  6 +++++-
 sys/dev/i2c/i2c.c                    |  6 ++++--
 sys/modules/Makefile                 |  4 +++-
 sys/modules/iic/i2c.ioconf           |  4 ++--
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/distrib/sets/lists/modules/md.evbppc b/distrib/sets/lists/modules/md.evbppc
index b36e6af1181c..5487e29f1418 100644
--- a/distrib/sets/lists/modules/md.evbppc
+++ b/distrib/sets/lists/modules/md.evbppc
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbppc,v 1.11 2011/09/29 17:40:19 sjg Exp $
+# $NetBSD: md.evbppc,v 1.12 2011/10/02 12:13:08 mbalmer Exp $
 ./stand/powerpc-4xx						base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@					base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules					base-kernel-modules	kmod
@@ -58,12 +58,16 @@
 ./stand/powerpc-4xx/@OSRELEASE@/modules/fss/fss.kmod			base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/gpio				base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/gpio/gpio.kmod			base-kernel-modules	kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/gpioiic				base-kernel-modules	kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/gpioiic/gpioiic.kmod		base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/gpioow				base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/gpioow/gpioow.kmod		base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/gpiosim				base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/gpiosim/gpiosim.kmod		base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/hfs				base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/hfs/hfs.kmod			base-kernel-modules	kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/iic				base-kernel-modules	kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/iic/iic.kmod			base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/kernfs				base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/kernfs/kernfs.kmod		base-kernel-modules	kmod
 ./stand/powerpc-4xx/@OSRELEASE@/modules/ksem				base-kernel-modules	kmod
@@ -217,12 +221,16 @@
 ./stand/powerpc-booke/@OSRELEASE@/modules/fss/fss.kmod			base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/gpio				base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/gpio/gpio.kmod		base-kernel-modules	kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/gpioiic			base-kernel-modules	kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/gpioiic/gpioiic.kmod		base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/gpioow				base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/gpioow/gpioow.kmod		base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/gpiosim			base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/gpiosim/gpiosim.kmod		base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/hfs				base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/hfs/hfs.kmod			base-kernel-modules	kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/iic				base-kernel-modules	kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/iic/iic.kmod			base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/kernfs				base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/kernfs/kernfs.kmod		base-kernel-modules	kmod
 ./stand/powerpc-booke/@OSRELEASE@/modules/ksem				base-kernel-modules	kmod
diff --git a/distrib/sets/lists/modules/mi b/distrib/sets/lists/modules/mi
index 5f0b624d3c7a..0fbf95eae12b 100644
--- a/distrib/sets/lists/modules/mi
+++ b/distrib/sets/lists/modules/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.33 2011/09/29 17:40:19 sjg Exp $
+# $NetBSD: mi,v 1.34 2011/10/02 12:13:09 mbalmer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -65,12 +65,16 @@
 ./@MODULEDIR@/fss/fss.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/gpio				base-kernel-modules	kmod
 ./@MODULEDIR@/gpio/gpio.kmod			base-kernel-modules	kmod
+./@MODULEDIR@/gpioiic				base-kernel-modules	kmod
+./@MODULEDIR@/gpioiic/gpioiic.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/gpioow				base-kernel-modules	kmod
 ./@MODULEDIR@/gpioow/gpioow.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/gpiosim				base-kernel-modules	kmod
 ./@MODULEDIR@/gpiosim/gpiosim.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/hfs				base-kernel-modules	kmod
 ./@MODULEDIR@/hfs/hfs.kmod			base-kernel-modules	kmod
+./@MODULEDIR@/iic				base-kernel-modules	kmod
+./@MODULEDIR@/iic/iic.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/kernfs				base-kernel-modules	kmod
 ./@MODULEDIR@/kernfs/kernfs.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/ksem				base-kernel-modules	kmod
diff --git a/sys/dev/i2c/i2c.c b/sys/dev/i2c/i2c.c
index c014a80f2915..9de8f5b8738b 100644
--- a/sys/dev/i2c/i2c.c
+++ b/sys/dev/i2c/i2c.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: i2c.c,v 1.28 2011/10/02 11:38:48 mbalmer Exp $	*/
+/*	$NetBSD: i2c.c,v 1.29 2011/10/02 12:13:08 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.28 2011/10/02 11:38:48 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.29 2011/10/02 12:13:08 mbalmer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,7 +52,9 @@ __KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.28 2011/10/02 11:38:48 mbalmer Exp $");
 #include <dev/i2c/i2cvar.h>
 
 #include "locators.h"
+#ifdef KERNEL_OPT
 #include <opt_i2cbus.h>
+#endif
 
 #define I2C_MAX_ADDR	0x3ff	/* 10-bit address, max */
 
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 900b54a41247..e99e16c56792 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.93 2011/09/29 17:40:19 sjg Exp $
+#	$NetBSD: Makefile,v 1.94 2011/10/02 12:13:08 mbalmer Exp $
 
 .include <bsd.own.mk>
 
@@ -25,9 +25,11 @@ SUBDIR+=	filemon
 SUBDIR+=	flash
 SUBDIR+=	fss
 SUBDIR+=	gpio
+SUBDIR+=	gpioiic
 SUBDIR+=	gpioow
 SUBDIR+=	gpiosim
 SUBDIR+=	hfs
+SUBDIR+=	iic
 SUBDIR+=	kernfs
 SUBDIR+=	ksem
 SUBDIR+=	layerfs
diff --git a/sys/modules/iic/i2c.ioconf b/sys/modules/iic/i2c.ioconf
index 4236ea36eced..bc8cc82e1006 100644
--- a/sys/modules/iic/i2c.ioconf
+++ b/sys/modules/iic/i2c.ioconf
@@ -1,6 +1,6 @@
-#	$NetBSD: i2c.ioconf,v 1.1 2011/10/02 11:43:30 mbalmer Exp $
+#	$NetBSD: i2c.ioconf,v 1.2 2011/10/02 12:13:08 mbalmer Exp $
 
-ioconf		i2c
+ioconf		iic
 
 include		"conf/files"
 include		"dev/i2c/files.i2c"