diff options
| author | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-06-16 21:30:13 +0000 |
|---|---|---|
| committer | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-06-16 21:30:13 +0000 |
| commit | 6947d21ee5dddbc0d5f548d134c1464db723da21 (patch) | |
| tree | f67224e548a658cbe0f2e00b343886103fe957d8 | |
| parent | 6aa3ffd6be08cc6a34078a683cdbdeac8ae9e73f (diff) | |
i2c and i2s are separete devices, and zaudio depends on them.
| -rw-r--r-- | sys/arch/arm/xscale/files.pxa2x0 | 10 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/files.zaurus | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/sys/arch/arm/xscale/files.pxa2x0 b/sys/arch/arm/xscale/files.pxa2x0 index e393320596f..76ddf18fc2b 100644 --- a/sys/arch/arm/xscale/files.pxa2x0 +++ b/sys/arch/arm/xscale/files.pxa2x0 @@ -1,4 +1,4 @@ -# $OpenBSD: files.pxa2x0,v 1.14 2005/06/16 21:06:55 uwe Exp $ +# $OpenBSD: files.pxa2x0,v 1.15 2005/06/16 21:30:11 uwe Exp $ # $NetBSD: files.pxa2x0,v 1.6 2004/05/01 19:09:14 thorpej Exp $ # # Configuration info for Intel PXA2[51]0 CPU support @@ -59,6 +59,14 @@ file arch/arm/xscale/pxa2x0_ohci.c pxaohci device lcd: wsemuldisplaydev, rasops16, rasops8, rasops4 file arch/arm/xscale/pxa2x0_lcd.c lcd needs-flag +# Inter-Integrated Circuit controller +device i2c {} +file arch/arm/xscale/pxa2x0_i2c.c i2c + +# Inter-IC Sound controller +device i2s {} +file arch/arm/xscale/pxa2x0_i2s.c i2s + # Power manager and APM emulation device apm file arch/arm/xscale/pxa2x0_apm.c apm needs-flag diff --git a/sys/arch/zaurus/conf/files.zaurus b/sys/arch/zaurus/conf/files.zaurus index 2c82ffd2ce2..b235e85dfa1 100644 --- a/sys/arch/zaurus/conf/files.zaurus +++ b/sys/arch/zaurus/conf/files.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: files.zaurus,v 1.18 2005/05/01 19:25:37 matthieu Exp $ +# $OpenBSD: files.zaurus,v 1.19 2005/06/16 21:30:12 uwe Exp $ # # First try for arm-specific configuration info # @@ -53,11 +53,9 @@ attach zts at pxaip file arch/zaurus/dev/zts.c zts needs-flag # Zaurus sound -device zaudio: audio, auconv, mulaw +device zaudio: audio, auconv, mulaw, i2s, i2c attach zaudio at pxaip file arch/zaurus/dev/zaurus_audio.c zaudio -file arch/arm/xscale/pxa2x0_i2s.c zaudio -file arch/arm/xscale/pxa2x0_i2c.c zaudio # # Machine-independent ATA drivers |