diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-03-31 13:30:26 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2013-03-31 13:30:26 +0000 |
| commit | 3e89b73f693848c47b864e26d1952b996e05e24e (patch) | |
| tree | 603cf2f72c9424e5600d253165c17bcc720c0114 /sys | |
| parent | 60311524ae199ea82ff765f65612b15380b5dfd3 (diff) | |
Unbreak the build on amd64 by making sure that inteldrm pulls in the generic
i2c bit-banging code. Requires us to move around the i2c_bitbang define.
Also move the onewire_bitbang define to be close to i2c_bitbang since they
are similar.
ok jsing@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/files | 11 | ||||
| -rw-r--r-- | sys/dev/i2c/files.i2c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/files.drm | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/sys/conf/files b/sys/conf/files index 3ca2bcbae21..f9f79ade2a3 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.544 2013/03/28 16:41:39 tedu Exp $ +# $OpenBSD: files,v 1.545 2013/03/31 13:30:23 kettenis Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -55,6 +55,12 @@ define rasops32 define rasops_bswap define rasops_rotation +# I2C bus bit-banging +define i2c_bitbang + +# 1-Wire bus bit-banging +define onewire_bitbang + # net device attributes - we have generic code for ether(net), # and fddi. define atm @@ -126,9 +132,6 @@ define atapi {[channel = -1]} device wdc: ata, atapi, wdc_base file dev/ic/wdc.c wdc_base -# 1-Wire bus bit-banging -define onewire_bitbang - # "Chipset" drivers. These are the bus-independent routines which # contain the cfdrivers. Attachments are provided by files.<bus> diff --git a/sys/dev/i2c/files.i2c b/sys/dev/i2c/files.i2c index 6aaa6ea20f4..aec54a21a73 100644 --- a/sys/dev/i2c/files.i2c +++ b/sys/dev/i2c/files.i2c @@ -1,13 +1,13 @@ -# $OpenBSD: files.i2c,v 1.50 2011/07/03 21:30:20 kettenis Exp $ +# $OpenBSD: files.i2c,v 1.51 2013/03/31 13:30:24 kettenis Exp $ # $NetBSD: files.i2c,v 1.3 2003/10/20 16:24:10 briggs Exp $ define i2c {[addr = -1], [size = -1]} -define i2c_bitbang device iic: i2c attach iic at i2cbus file dev/i2c/i2c.c iic | i2cbus file dev/i2c/i2c_exec.c iic | i2cbus file dev/i2c/i2c_scan.c iic | i2cbus + file dev/i2c/i2c_bitbang.c i2c_bitbang # diff --git a/sys/dev/pci/drm/files.drm b/sys/dev/pci/drm/files.drm index dc7ffd80f73..e8852a8fbd9 100644 --- a/sys/dev/pci/drm/files.drm +++ b/sys/dev/pci/drm/files.drm @@ -1,5 +1,5 @@ # $NetBSD: files.drm,v 1.2 2007/03/28 11:29:37 jmcneill Exp $ -# $OpenBSD: files.drm,v 1.24 2013/03/18 12:36:51 jsg Exp $ +# $OpenBSD: files.drm,v 1.25 2013/03/31 13:30:25 kettenis Exp $ # direct rendering modules define drmbase {} @@ -21,7 +21,7 @@ file dev/pci/drm/drm_edid.c drm file dev/pci/drm/drm_dp_helper.c drm file dev/pci/drm/drm_fb_helper.c drm -device inteldrm: drmbase, wsemuldisplaydev, rasops32 +device inteldrm: drmbase, wsemuldisplaydev, rasops32, i2cbus, i2c_bitbang attach inteldrm at drmdev file dev/pci/drm/i915/i915_dma.c inteldrm file dev/pci/drm/i915/i915_drv.c inteldrm |