Module Name: src Committed By: christos Date: Fri Oct 28 19:00:48 UTC 2016
Modified Files: src/sys/arch/evbarm/gumstix: gxio.c Log Message: sprinkle ifdef spices. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/gumstix/gxio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/evbarm/gumstix/gxio.c diff -u src/sys/arch/evbarm/gumstix/gxio.c:1.23 src/sys/arch/evbarm/gumstix/gxio.c:1.24 --- src/sys/arch/evbarm/gumstix/gxio.c:1.23 Tue Oct 18 10:39:52 2016 +++ src/sys/arch/evbarm/gumstix/gxio.c Fri Oct 28 15:00:48 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: gxio.c,v 1.23 2016/10/18 14:39:52 kiyohara Exp $ */ +/* $NetBSD: gxio.c,v 1.24 2016/10/28 19:00:48 christos Exp $ */ /* * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation. * All rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.23 2016/10/18 14:39:52 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.24 2016/10/28 19:00:48 christos Exp $"); #include "opt_cputypes.h" #include "opt_gumstix.h" @@ -261,6 +261,7 @@ static const struct omap_mux_conf overo_ MUXMODE(0) | PULLUDENABLE | PULLTYPESELECT | INPUTENABLE }, { -1 } }; +#if defined(OVERO) static const struct omap_mux_conf overo_mux_wireless_conf[] = { { 0x0b4, MUXMODE(4) }, /* gpio_54:BT_nPOWERON*/ { 0x0bc, MUXMODE(4) | INPUTENABLE }, /* gpio_58: WIFI_IRQ */ @@ -269,6 +270,7 @@ static const struct omap_mux_conf overo_ { -1 } }; +#elif defined(DUOVERO) static const struct omap_mux_conf duovero_mux_led_conf[] = { { 0x116, MUXMODE(3) }, /* GPIO 122 */ { -1 } @@ -279,6 +281,7 @@ static const struct omap_mux_conf duover { -1 } }; +#elif defined(PEPPER) static const struct omap_mux_conf pepper_mux_led_conf[] = { { 0x850, MMODE(7) | PUDEN }, /* GPIO 52: Blue */ { 0x854, MMODE(7) | PUDEN }, /* GPIO 53: Red */ @@ -301,6 +304,7 @@ static const struct omap_mux_conf pepper { 0x840, MMODE(7) | PUDEN }, /* GPIO 48: #Reset */ { -1 } }; +#endif #endif