diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-01-01 20:52:29 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-01-01 20:52:29 +0000 |
| commit | 5c6a275d22890d00126f51fb7cbff1aa01948aca (patch) | |
| tree | 7b1673167ce83d637e54ce54d8bd795cdcd691f6 /sys/arch/macppc/conf/files.macppc | |
| parent | 2e8171134016d44dbd15da591feea9b72aae4eca (diff) | |
switch from macppc-specific maciic(4) driver to the generic iic(4),
after teaching it to use a function pointer to get back to the OFW
scan.. this will also help the sparc64 later; ok kettenis
Diffstat (limited to 'sys/arch/macppc/conf/files.macppc')
| -rw-r--r-- | sys/arch/macppc/conf/files.macppc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index b4d7fda95d1..b8a2ce0eba0 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.macppc,v 1.43 2005/12/21 18:50:51 miod Exp $ +# $OpenBSD: files.macppc,v 1.44 2006/01/01 20:52:23 deraadt Exp $ # # macppc-specific configuration info @@ -77,7 +77,7 @@ device ht {} : pcibus attach ht at mainbus file arch/macppc/pci/ht.c ht -device smu {} : i2cbus +device smu: i2cbus attach smu at mainbus file arch/macppc/dev/smu.c smu file dev/clock_subr.c smu @@ -185,13 +185,13 @@ attach mediabay at macobio file arch/macppc/dev/mediabay.c mediabay # Keywest I2C -device ki2c {} +device ki2c: i2cbus attach ki2c at macobio attach ki2c at memc with ki2c_memc file arch/macppc/dev/ki2c.c ki2c # PMU I2C -device pi2c {} +device pi2c: i2cbus attach pi2c at adb file arch/macppc/dev/pi2c.c pi2c @@ -271,10 +271,7 @@ include "dev/usb/files.usb" # Machine-independent I2C drivers # include "dev/i2c/files.i2c" - -device maciic {} : i2c -attach maciic at ki2c, pi2c, smu -file arch/macppc/dev/maci2c.c maciic +file arch/macppc/dev/maci2c.c i2cbus # # Machine-independent GPIO drivers |