diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-11-19 20:55:49 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-11-19 20:55:49 +0000 |
| commit | 0fe2c4673be6244e907b333d32292a90852fcb0f (patch) | |
| tree | bbd054b963fcfd95d6c4ae8d8bdea140167d83d8 /sys/arch/landisk | |
| parent | 6a986e8479d7aaf39bf85f818e98abdcdebf9fae (diff) | |
Sync MAKEDEV against conf.c, and both against GENERIC.
Diffstat (limited to 'sys/arch/landisk')
| -rw-r--r-- | sys/arch/landisk/landisk/conf.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c index 8c23e827a2f..f6dc1139745 100644 --- a/sys/arch/landisk/landisk/conf.c +++ b/sys/arch/landisk/landisk/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.17 2010/09/23 05:02:14 claudio Exp $ */ +/* $OpenBSD: conf.c,v 1.18 2010/11/19 20:55:48 miod Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -39,7 +39,7 @@ * Character and Block Device configuration * Console configuration * - * Defines the structures cdevsw and constab + * Defines the structures [bc]devsw * * Created : 17/09/94 */ @@ -76,15 +76,6 @@ #include "ksyms.h" /* - * APM interface - */ -#ifdef CONF_HAVE_APM -#include "apm.h" -#else -#define NAPM 0 -#endif - -/* * Disk/Filesystem pseudo-devices */ #include "ccd.h" /* concatenated disk driver */ @@ -272,12 +263,6 @@ cdev_decl(nnpfs_dev); #include "vscsi.h" #include "pppx.h" -#ifdef CONF_HAVE_GPIO -#include "gpio.h" -#else -#define NGPIO 0 -#endif - struct cdevsw cdevsw[] = { cdev_cn_init(1,cn), /* 0: virtual console */ cdev_ctty_init(1,ctty), /* 1: controlling terminal */ @@ -292,7 +277,7 @@ struct cdevsw cdevsw[] = { cdev_lkm_dummy(), /* 10: */ cdev_tty_init(NSCIF,scif), /* 11: scif */ cdev_tty_init(NCOM,com), /* 12: serial port */ - cdev_gpio_init(NGPIO,gpio), /* 13: GPIO interface */ + cdev_lkm_dummy(), /* 13: */ cdev_lkm_dummy(), /* 14: */ cdev_lkm_dummy(), /* 15: */ cdev_disk_init(NWD,wd), /* 16: ST506/ESDI/IDE disk */ @@ -313,7 +298,7 @@ struct cdevsw cdevsw[] = { cdev_lkm_dummy(), /* 31: */ cdev_lkm_dummy(), /* 32: */ cdev_tun_init(NTUN,tun), /* 33: network tunnel */ - cdev_apm_init(NAPM,apm), /* 34: APM interface */ + cdev_lkm_dummy(), /* 34: */ cdev_lkm_init(NLKM,lkm), /* 35: loadable module driver */ cdev_audio_init(NAUDIO,audio), /* 36: generic audio I/O */ cdev_hotplug_init(NHOTPLUG,hotplug), /* 37: devices hot plugging*/ |