diff options
| author | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-06-16 21:06:56 +0000 |
|---|---|---|
| committer | Uwe Stuehler <uwe@cvs.openbsd.org> | 2005-06-16 21:06:56 +0000 |
| commit | 6aa3ffd6be08cc6a34078a683cdbdeac8ae9e73f (patch) | |
| tree | eb24430c9b38cd0841309c244ff36449f15100d7 /sys/arch/arm | |
| parent | f6e5b0273dfc84dfec47c7176fdc02d588694a4f (diff) | |
unbust "com at pxaip" attachment so that there is no need to enable
"com at pcmcia" in RAMDISK as a workaround.
Diffstat (limited to 'sys/arch/arm')
| -rw-r--r-- | sys/arch/arm/xscale/files.pxa2x0 | 10 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_com.c | 13 |
2 files changed, 7 insertions, 16 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) |