summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/macppc/conf/GENERIC3
-rw-r--r--sys/arch/macppc/conf/RAMDISK3
-rw-r--r--sys/arch/macppc/conf/files.macppc3
-rw-r--r--sys/arch/macppc/dev/ki2c.c6
4 files changed, 11 insertions, 4 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 221146d0f23..8d48a22e3f8 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.96 2005/11/05 11:56:39 brad Exp $g
+# $OpenBSD: GENERIC,v 1.97 2005/11/06 03:10:08 drahn Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -33,6 +33,7 @@ cpu* at mainbus0
mpcpcibr* at mainbus0 # MPC106 PCI Bridge.
memc* at mainbus0
+ki2c* at memc? # Keywest I2C
pchb* at pci?
ht* at mainbus0
smu* at mainbus0
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index d7f2893f84f..9bd2050b116 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.54 2005/10/25 14:20:36 brad Exp $
+# $OpenBSD: RAMDISK,v 1.55 2005/11/06 03:10:09 drahn Exp $
#
# PPC GENERIC config file
#
@@ -33,6 +33,7 @@ cpu* at mainbus0
mpcpcibr* at mainbus0 # MPC106 PCI Bridge.
memc* at mainbus0
+ki2c* at memc? # Keywest I2C
pchb* at pci? # host bridge identifiers
ht* at mainbus0
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index 368b711a37b..7c04d52f492 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.macppc,v 1.31 2005/10/31 00:24:57 brad Exp $
+# $OpenBSD: files.macppc,v 1.32 2005/11/06 03:10:09 drahn Exp $
#
# macppc-specific configuration info
@@ -191,6 +191,7 @@ file arch/macppc/dev/mediabay.c mediabay
# Keywest I2C
device ki2c {}
attach ki2c at macobio
+attach ki2c at memc with ki2c_memc
file arch/macppc/dev/ki2c.c ki2c
# I2S
diff --git a/sys/arch/macppc/dev/ki2c.c b/sys/arch/macppc/dev/ki2c.c
index c153b3622f5..c4584c27995 100644
--- a/sys/arch/macppc/dev/ki2c.c
+++ b/sys/arch/macppc/dev/ki2c.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ki2c.c,v 1.3 2005/11/05 04:33:20 brad Exp $ */
+/* $OpenBSD: ki2c.c,v 1.4 2005/11/06 03:10:09 drahn Exp $ */
/* $NetBSD: ki2c.c,v 1.1 2003/12/27 02:19:34 grant Exp $ */
/*-
@@ -54,6 +54,10 @@ int ki2c_write(struct ki2c_softc *, int, int, const void *, int);
struct cfattach ki2c_ca = {
sizeof(struct ki2c_softc), ki2c_match, ki2c_attach
};
+struct cfattach ki2c_memc_ca = {
+ sizeof(struct ki2c_softc), ki2c_match, ki2c_attach
+};
+
struct cfdriver ki2c_cd = {
NULL, "ki2c", DV_DULL
};