summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2004-06-05 15:21:02 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2004-06-05 15:21:02 +0000
commitbbdcb06c8fef066bb9a620b2ed2ff33831b7a668 (patch)
tree891ec240346c3f4444675fe28971f283a77cc4a1 /sys/arch
parentd5c430c86ff6a416306d619d488df6aabe1fd73a (diff)
Replace NGPIO button with SMALL_KERNEL.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/pci/gscpcib.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/sys/arch/i386/pci/gscpcib.c b/sys/arch/i386/pci/gscpcib.c
index 19316ec1269..1a119e0f563 100644
--- a/sys/arch/i386/pci/gscpcib.c
+++ b/sys/arch/i386/pci/gscpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gscpcib.c,v 1.1 2004/06/03 18:22:21 grange Exp $ */
+/* $OpenBSD: gscpcib.c,v 1.2 2004/06/05 15:21:01 grange Exp $ */
/*
* Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
*
@@ -37,8 +37,6 @@
#include <i386/pci/gscpcibreg.h>
-#include "gpio.h"
-
struct gscpcib_softc {
struct device sc_dev;
@@ -88,7 +86,7 @@ gscpcib_match(struct device *parent, void *match, void *aux)
void
gscpcib_attach(struct device *parent, struct device *self, void *aux)
{
-#if NGPIO > 0
+#ifndef SMALL_KERNEL
struct gscpcib_softc *sc = (struct gscpcib_softc *)self;
struct pci_attach_args *pa = aux;
struct gpiobus_attach_args gba;
@@ -134,18 +132,18 @@ gscpcib_attach(struct device *parent, struct device *self, void *aux)
gpio_present = 1;
corepcib:
-#endif
+#endif /* !SMALL_KERNEL */
/* Provide core pcib(4) functionality */
pcibattach(parent, self, aux);
-#if NGPIO > 0
+#ifndef SMALL_KERNEL
/* Attach GPIO framework */
if (gpio_present)
config_found(&sc->sc_dev, &gba, gpiobus_print);
-#endif
+#endif /* !SMALL_KERNEL */
}
-#if NGPIO > 0
+#ifndef SMALL_KERNEL
static __inline void
gscpcib_gpio_pin_select(struct gscpcib_softc *sc, int pin)
{
@@ -205,4 +203,4 @@ gscpcib_gpio_pin_ctl(void *arg, int pin, int flags)
bus_space_write_4(sc->sc_gpio_iot, sc->sc_gpio_ioh,
GSCGPIO_CONF, conf);
}
-#endif
+#endif /* !SMALL_KERNEL */