diff options
| -rw-r--r-- | sys/arch/arm/xscale/files.pxa2x0 | 10 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_com.c | 13 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/conf/files | 4 |
4 files changed, 10 insertions, 20 deletions
diff --git a/sys/arch/arm/xscale/files.pxa2x0 b/sys/arch/arm/xscale/files.pxa2x0 index 9b8eae551e3..e393320596f 100644 --- a/sys/arch/arm/xscale/files.pxa2x0 +++ b/sys/arch/arm/xscale/files.pxa2x0 @@ -1,4 +1,4 @@ -# $OpenBSD: files.pxa2x0,v 1.13 2005/05/27 19:01:21 uwe Exp $ +# $OpenBSD: files.pxa2x0,v 1.14 2005/06/16 21:06:55 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 @@ -41,10 +41,10 @@ attach saost at pxaip file arch/arm/sa11x0/sa11x0_ost.c saost needs-flag # NS16550 compatible serial ports -attach com at pxaip with pxauart -file arch/arm/xscale/pxa2x0_com.c pxauart -file arch/arm/xscale/pxa2x0_a4x_space.c pxauart | obio -file arch/arm/xscale/pxa2x0_a4x_io.S pxauart | obio +attach com at pxaip with com_pxaip +file arch/arm/xscale/pxa2x0_com.c com_pxaip +file arch/arm/xscale/pxa2x0_a4x_space.c com_pxaip +file arch/arm/xscale/pxa2x0_a4x_io.S com_pxaip # PXA27x USB Device Controller device pxaudc diff --git a/sys/arch/arm/xscale/pxa2x0_com.c b/sys/arch/arm/xscale/pxa2x0_com.c index dab4d574eff..d1a55da5f41 100644 --- a/sys/arch/arm/xscale/pxa2x0_com.c +++ b/sys/arch/arm/xscale/pxa2x0_com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_com.c,v 1.5 2005/05/27 18:42:15 uwe Exp $ */ +/* $OpenBSD: pxa2x0_com.c,v 1.6 2005/06/16 21:06:55 uwe Exp $ */ /* $NetBSD: pxa2x0_com.c,v 1.4 2003/07/15 00:24:55 lukem Exp $ */ /* @@ -62,18 +62,9 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_com.c,v 1.4 2003/07/15 00:24:55 lukem Exp $") static int pxauart_match(struct device *, void *, void *); static void pxauart_attach(struct device *, struct device *, void *); -#ifdef __NetBSD__ -CFATTACH_DECL(pxauart, sizeof(struct com_softc), - pxauart_match, pxauart_attach, NULL, NULL); -#else -struct cfattach pxauart_ca = { +struct cfattach com_pxaip_ca = { sizeof (struct com_softc), pxauart_match, pxauart_attach }; - -struct cfdriver pxauart_cd = { - NULL, "pxauart", DV_DULL -}; -#endif static int pxauart_match(struct device *parent, void *cf, void *aux) diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK index faabe096190..857c2b1f86e 100644 --- a/sys/arch/zaurus/conf/RAMDISK +++ b/sys/arch/zaurus/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.29 2005/05/31 23:05:41 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.30 2005/06/16 21:06:55 uwe Exp $ machine zaurus arm @@ -114,7 +114,6 @@ com2 at pxaip? addr 0x40700000 intr 20 # Standard UART (for IrDA) # CF (pcmcia) support pxapcic0 at pxaip? pcmcia* at pxapcic? -com* at pcmcia? # PCMCIA modems/serial ports wi* at pcmcia? ne* at pcmcia? wdc* at pcmcia? diff --git a/sys/conf/files b/sys/conf/files index f7f0c670755..78aa349e7cb 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.344 2005/06/08 05:01:04 henning Exp $ +# $OpenBSD: files,v 1.345 2005/06/16 21:06:55 uwe Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -290,7 +290,7 @@ device com: tty file dev/ic/com.c com & (com_isa | com_isapnp | com_commulti | com_pcmcia | com_localbus | com_gsc | - com_puc | com_ebus | com_pxa2x0 | + com_puc | com_ebus | com_pxaip | com_dino) needs-flag # PC-like keyboard controller |