summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-11-16 03:43:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-11-16 03:43:41 +0000
commitadacd258644238e13c210c9a37328f7ab7c7c238 (patch)
tree4f40c25b79a3be092b4a161e0de48fa3e73ca2e5
parente6e7074b3348fb5952673d57b5189278fe835a3b (diff)
macppc can have gpio
-rw-r--r--sys/arch/macppc/conf/files.macppc7
-rw-r--r--sys/arch/macppc/macppc/conf.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index 3a6393c7d46..67f9537d5ff 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.macppc,v 1.37 2005/11/15 16:19:15 deraadt Exp $
+# $OpenBSD: files.macppc,v 1.38 2005/11/16 03:43:40 deraadt Exp $
#
# macppc-specific configuration info
@@ -270,6 +270,11 @@ device maciic {} : i2c
attach maciic at ki2c, smu
file arch/macppc/dev/maci2c.c maciic
+#
+# Machine-independent GPIO drivers
+#
+include "dev/gpio/files.gpio"
+
# Sun HME Ethernet controllers
device hme: ether, ifnet, mii, ifmedia
file dev/ic/hme.c
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index a04b3bc1cbc..79b05219f7f 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.26 2004/05/30 08:11:26 grange Exp $ */
+/* $OpenBSD: conf.c,v 1.27 2005/11/16 03:43:40 deraadt Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -145,6 +145,7 @@ cdev_decl(pci);
#include "radio.h"
#include "bktr.h"
#include "hotplug.h"
+#include "gpio.h"
struct cdevsw cdevsw[] = {
cdev_cn_init(1,cn), /* 0: virtual console */
@@ -238,6 +239,7 @@ struct cdevsw cdevsw[] = {
cdev_radio_init(NRADIO, radio), /* 76: generic radio I/O */
cdev_ptm_init(NPTY,ptm), /* 77: pseudo-tty ptm device */
cdev_hotplug_init(NHOTPLUG,hotplug), /* 78: devices hot plugging */
+ cdev_gpio_init(NGPIO,gpio), /* 79: GPIO interface */
};
int nchrdev = sizeof cdevsw / sizeof cdevsw[0];