[src/trunk]: src/sys/arch Make this build without gpio(4).

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b99ee3889610
branches:  trunk
changeset: 747705:b99ee3889610
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Sep 27 18:27:01 2009 +0000

description:
Make this build without gpio(4).

diffstat:

 sys/arch/i386/pci/gcscpcib.c |  8 ++++++--
 sys/arch/x86/pci/ichlpcib.c  |  6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (73 lines):

diff -r da0a1e1ecaa1 -r b99ee3889610 sys/arch/i386/pci/gcscpcib.c
--- a/sys/arch/i386/pci/gcscpcib.c      Sun Sep 27 18:24:23 2009 +0000
+++ b/sys/arch/i386/pci/gcscpcib.c      Sun Sep 27 18:27:01 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscpcib.c,v 1.7 2009/05/04 12:41:09 cegger Exp $ */
+/* $NetBSD: gcscpcib.c,v 1.8 2009/09/27 18:31:58 jakllsch Exp $ */
 /* $OpenBSD: gcscpcib.c,v 1.6 2007/11/17 17:02:47 mbalmer Exp $        */
 
 /*
@@ -24,7 +24,7 @@
  * AMD CS5535/CS5536 series LPC bridge also containing timer, watchdog and GPIO.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscpcib.c,v 1.7 2009/05/04 12:41:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscpcib.c,v 1.8 2009/09/27 18:31:58 jakllsch Exp $");
 
 #include "gpio.h"
 
@@ -87,11 +87,13 @@
        struct sysmon_wdog      sc_smw;
        int                     sc_wdt_mfgpt;
 
+#if NGPIO > 0
        /* GPIO interface */
        bus_space_tag_t         sc_gpio_iot;
        bus_space_handle_t      sc_gpio_ioh;
        struct gpio_chipset_tag sc_gpio_gc;
        gpio_pin_t              sc_gpio_pins[AMD553X_GPIO_NPINS];
+#endif
 
        /* SMbus/i2c interface */ 
 #if 0
@@ -159,7 +161,9 @@
        sc->sc_pcib.sc_pc = pa->pa_pc;
        sc->sc_pcib.sc_tag = pa->pa_tag;
        sc->sc_iot = pa->pa_iot;
+#if NGPIO > 0
        sc->sc_gpio_iot = pa->pa_iot;
+#endif
 
        /* Attach the PCI-ISA bridge at first */
        pcibattach(parent, self, aux);
diff -r da0a1e1ecaa1 -r b99ee3889610 sys/arch/x86/pci/ichlpcib.c
--- a/sys/arch/x86/pci/ichlpcib.c       Sun Sep 27 18:24:23 2009 +0000
+++ b/sys/arch/x86/pci/ichlpcib.c       Sun Sep 27 18:27:01 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ichlpcib.c,v 1.20 2009/09/27 17:55:31 jakllsch Exp $   */
+/*     $NetBSD: ichlpcib.c,v 1.21 2009/09/27 18:27:01 jakllsch Exp $   */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.20 2009/09/27 17:55:31 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.21 2009/09/27 18:27:01 jakllsch Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -303,10 +303,12 @@
        struct lpcib_softc *sc = device_private(self);
        uint32_t val;
 
+#if NGPIO > 0
        if (sc->sc_gpiobus == child) {
                sc->sc_gpiobus = NULL;
                return;
        }
+#endif
        if (sc->sc_hpetbus != child) {
                pcibchilddet(self, child);
                return;