diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-08-10 14:40:28 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-08-10 14:40:28 +0000 |
| commit | 64499784b988b90c08df7e91e664016adc489f48 (patch) | |
| tree | b3be514b55e6a69979abe61ca0f7c4a6b0e669ba /sys/arch/amd64 | |
| parent | 42bfab09100b2edae416d415f49f7411ed63162c (diff) | |
gpio for amd64.
ok deraadt@
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/files.amd64 | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index dc3f48ac042..683bd39f7ff 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.25 2009/06/03 14:45:50 jj Exp $ */ +/* $OpenBSD: conf.c,v 1.26 2009/08/10 14:40:27 jsg Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -189,6 +189,7 @@ cdev_decl(pci); #include "pf.h" #include "hotplug.h" +#include "gpio.h" struct cdevsw cdevsw[] = { @@ -300,6 +301,7 @@ struct cdevsw cdevsw[] = cdev_nvram_init(NNVRAM,nvram), /* 85: NVRAM interface */ cdev_agp_init(NAGP,agp), /* 86: agp */ cdev_drm_init(NDRM,drm), /* 87: drm */ + cdev_gpio_init(NGPIO,gpio), /* 88: gpio */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64 index 846425dadb2..f0efcf40f35 100644 --- a/sys/arch/amd64/conf/files.amd64 +++ b/sys/arch/amd64/conf/files.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.amd64,v 1.52 2009/06/06 05:26:28 oga Exp $ +# $OpenBSD: files.amd64,v 1.53 2009/08/10 14:40:27 jsg Exp $ maxpartitions 16 maxusers 2 16 128 @@ -213,6 +213,11 @@ include "dev/bluetooth/files.bluetooth" include "dev/i2c/files.i2c" # +# Machine-independent GPIO drivers +# +include "dev/gpio/files.gpio" + +# # ACPI # include "../../../dev/acpi/files.acpi" |