summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/conf.c10
-rw-r--r--sys/arch/amd64/amd64/conf.c10
-rw-r--r--sys/arch/arm/arm/conf.c10
-rw-r--r--sys/arch/aviion/aviion/conf.c10
-rw-r--r--sys/arch/hp300/hp300/conf.c10
-rw-r--r--sys/arch/hppa/hppa/conf.c10
-rw-r--r--sys/arch/hppa64/hppa64/conf.c10
-rw-r--r--sys/arch/i386/i386/conf.c10
-rw-r--r--sys/arch/landisk/landisk/conf.c10
-rw-r--r--sys/arch/loongson/loongson/conf.c10
-rw-r--r--sys/arch/luna88k/luna88k/conf.c10
-rw-r--r--sys/arch/macppc/macppc/conf.c11
-rw-r--r--sys/arch/mvme68k/mvme68k/conf.c10
-rw-r--r--sys/arch/mvme88k/mvme88k/conf.c10
-rw-r--r--sys/arch/octeon/octeon/conf.c10
-rw-r--r--sys/arch/sgi/sgi/conf.c10
-rw-r--r--sys/arch/sparc/sparc/conf.c10
-rw-r--r--sys/arch/sparc64/sparc64/conf.c11
-rw-r--r--sys/arch/vax/vax/conf.c11
19 files changed, 19 insertions, 174 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 9bda6cfd77d..b974d93ed4d 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.68 2012/04/06 15:10:39 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.69 2012/08/23 06:12:49 deraadt Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -111,10 +111,6 @@ cdev_decl(wd);
cdev_decl(fd);
#include "cy.h"
cdev_decl(cy);
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "ksyms.h"
/* USB Devices */
@@ -190,11 +186,7 @@ struct cdevsw cdevsw[] =
cdev_usbdev_init(NUGEN,ugen), /* 48: USB generic driver */
cdev_tty_init(NUCOM, ucom), /* 49: USB tty */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev),/* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51 */
-#endif
#ifdef USER_PCICONF
cdev_pci_init(NPCI,pci), /* 52: PCI user */
#else
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 0f6a8c77b8e..98502cadb7b 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.37 2012/04/06 15:10:39 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.38 2012/08/23 06:12:49 deraadt Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -147,10 +147,6 @@ cdev_decl(music);
#include "bthub.h"
#include "pctr.h"
#include "iop.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "bktr.h"
#include "ksyms.h"
#include "usb.h"
@@ -244,11 +240,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_bktr_init(NBKTR,bktr), /* 49: Bt848 video capture device */
cdev_ksyms_init(NKSYMS,ksyms), /* 50: Kernel symbols device */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51 */
-#endif
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 53: sequencer I/O */
cdev_notdef(), /* 54 was: RAIDframe disk driver */
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 38c35676836..93708675ef2 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.32 2012/04/06 15:10:39 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.33 2012/08/23 06:12:49 deraadt Exp $ */
/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */
/*
@@ -263,10 +263,6 @@ struct bdevsw bdevsw[] = {
#define ptctty ptytty
#define ptcioctl ptyioctl
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "systrace.h"
#include "hotplug.h"
@@ -337,11 +333,7 @@ struct cdevsw cdevsw[] = {
cdev_lkm_dummy(), /* 48: reserved */
cdev_lkm_dummy(), /* 49: reserved */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51: reserved */
-#endif
cdev_bio_init(NBIO,bio), /* 52: ioctl tunnel */
cdev_notdef(), /* 53: reserved */
cdev_notdef(), /* 54 was FOOTBRIDGE console */
diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c
index bb3839a9679..a9470fb9800 100644
--- a/sys/arch/aviion/aviion/conf.c
+++ b/sys/arch/aviion/aviion/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.15 2011/10/06 20:49:27 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.16 2012/08/23 06:12:49 deraadt Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -59,10 +59,6 @@
#include "vnd.h"
#include "vscsi.h"
#include "pppx.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
struct bdevsw bdevsw[] =
{
@@ -141,11 +137,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51 */
-#endif
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */
cdev_disk_init(1,diskmap), /* 54: disk mapper */
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index bcac959c17c..0b4a3fcc8c3 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.53 2011/12/21 23:12:03 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.54 2012/08/23 06:12:49 deraadt Exp $ */
/* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */
/*-
@@ -102,10 +102,6 @@ cdev_decl(fd);
#include "bpfilter.h"
#include "tun.h"
#include "ksyms.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "wsdisplay.h"
#include "wskbd.h"
#include "wsmouse.h"
@@ -169,11 +165,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51 */
-#endif
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */
cdev_disk_init(1,diskmap), /* 54: disk mapper */
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 0510d84de25..cb87d8bd285 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.54 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.55 2012/08/23 06:12:49 deraadt Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -86,10 +86,6 @@ int nblkdev = nitems(bdevsw);
#include "wskbd.h"
#include "wsmouse.h"
#include "wsmux.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "inet.h"
#include "bpfilter.h"
@@ -164,11 +160,7 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(), /* 31: */
#endif
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 32: nnpfs communication device */
-#else
cdev_notdef(),
-#endif
cdev_video_init(NVIDEO,video), /* 33: generic video I/O */
cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */
cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */
diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index 9ad3f5d7531..db70537e478 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.21 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.22 2012/08/23 06:12:49 deraadt Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -86,10 +86,6 @@ int nblkdev = nitems(bdevsw);
#include "wskbd.h"
#include "wsmouse.h"
#include "wsmux.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "inet.h"
#include "bpfilter.h"
@@ -164,11 +160,7 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(), /* 31: */
#endif
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 32: nnpfs communication device */
-#else
cdev_notdef(),
-#endif
cdev_video_init(NVIDEO,video), /* 33: generic video I/O */
cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */
cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 27b26e486dd..9e2ee7f5c8d 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.140 2012/04/06 15:10:39 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.141 2012/08/23 06:12:49 deraadt Exp $ */
/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */
/*
@@ -149,10 +149,6 @@ cdev_decl(music);
#include "pctr.h"
#include "bios.h"
#include "iop.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "bktr.h"
#include "ksyms.h"
#include "usb.h"
@@ -248,11 +244,7 @@ struct cdevsw cdevsw[] =
cdev_ocis_init(NBIOS,bios), /* 48: onboard BIOS PROM */
cdev_bktr_init(NBKTR,bktr), /* 49: Bt848 video capture device */
cdev_ksyms_init(NKSYMS,ksyms), /* 50: Kernel symbols device */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51 */
-#endif
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 53: sequencer I/O */
cdev_notdef(), /* 54 was: RAIDframe disk driver */
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index 7da650156bc..23db126a590 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.22 2012/04/06 15:10:40 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.23 2012/08/23 06:12:49 deraadt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -250,10 +250,6 @@ struct bdevsw bdevsw[] = {
#define ptctty ptytty
#define ptcioctl ptyioctl
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "systrace.h"
#include "hotplug.h"
@@ -313,11 +309,7 @@ struct cdevsw cdevsw[] = {
cdev_lkm_dummy(), /* 48: reserved */
cdev_lkm_dummy(), /* 49: reserved */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51: reserved */
-#endif
cdev_notdef(), /* 52: reserved */
cdev_notdef(), /* 53: reserved */
cdev_notdef(), /* 54: reserved */
diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index ae2e77ce174..31de297f743 100644
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.13 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.14 2012/08/23 06:12:49 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -105,10 +105,6 @@ cdev_decl(lpt);
cdev_decl(wd);
#include "audio.h"
#include "video.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "ksyms.h"
#include "wsdisplay.h"
@@ -192,11 +188,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51: */
-#endif
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_notdef(), /* 53: */
cdev_notdef(), /* 54: */
diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c
index 809febbcf5e..b4b89d69f6e 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.17 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.18 2012/08/23 06:12:49 deraadt Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -52,10 +52,6 @@
#include "st.h"
#include "uk.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "ksyms.h"
#include "lcd.h"
@@ -150,11 +146,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51 */
-#endif
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */
cdev_disk_init(1,diskmap), /* 54: disk mapper */
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 197d1a55d6f..ab374da1593 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.47 2012/04/06 15:10:40 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.48 2012/08/23 06:12:49 deraadt Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -95,11 +95,6 @@ cdev_decl(com);
#include "tun.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
-
#ifdef LKM
#define NLKM 1
#else
@@ -196,11 +191,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51 */
-#endif
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 53: sequencer I/O */
cdev_notdef(), /* 54 was: RAIDframe disk driver */
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index 8dd9be0d16f..1429e005250 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.53 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.54 2012/08/23 06:12:49 deraadt Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
@@ -134,10 +134,6 @@ cdev_decl(fd);
#include "lp.h"
#include "lptwo.h"
cdev_decl(lptwo);
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "ksyms.h"
#ifdef notyet
@@ -211,11 +207,7 @@ struct cdevsw cdevsw[] =
cdev_lkm_dummy(), /* 48 */
cdev_lkm_dummy(), /* 49 */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_lkm_dummy(), /* 51 */
-#endif
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */
cdev_disk_init(1,diskmap), /* 54: disk mapper */
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 71dbd9c4037..8095e32f91f 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.46 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.47 2012/08/23 06:12:49 deraadt Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -52,10 +52,6 @@
#include "st.h"
#include "uk.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "ksyms.h"
#include "sram.h"
@@ -198,11 +194,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51 */
-#endif
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */
cdev_disk_init(1,diskmap), /* 54: disk mapper */
diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c
index 6ea993635f4..af3b628ee6b 100644
--- a/sys/arch/octeon/octeon/conf.c
+++ b/sys/arch/octeon/octeon/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.7 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.8 2012/08/23 06:12:49 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -110,10 +110,6 @@ cdev_decl(lpt);
cdev_decl(wd);
#include "audio.h"
#include "video.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
cdev_decl(octcf);
#include "ksyms.h"
@@ -203,11 +199,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51: */
-#endif
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_notdef(), /* 53: */
cdev_notdef(), /* 54: */
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 0da5395e126..85638ecfb22 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.30 2012/03/28 20:44:23 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.31 2012/08/23 06:12:49 deraadt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -106,10 +106,6 @@ cdev_decl(lpt);
cdev_decl(wd);
#include "audio.h"
#include "video.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "ksyms.h"
#include "wsdisplay.h"
@@ -192,11 +188,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51: */
-#endif
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_notdef(), /* 53: */
cdev_notdef(), /* 54: */
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index 873bcd33982..62856506ab7 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.60 2012/04/06 15:10:40 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.61 2012/08/23 06:12:49 deraadt Exp $ */
/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
/*
@@ -84,10 +84,6 @@
#include "wsmouse.h"
#include "wsmux.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
#include "ksyms.h"
struct bdevsw bdevsw[] =
@@ -182,11 +178,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51 */
-#endif
cdev_notdef(), /* 52 */
cdev_notdef(), /* 53 */
cdev_disk_init(NFD,fd), /* 54: floppy disk */
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index be58f382f37..b8aecd03d76 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.63 2012/04/06 15:10:40 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.64 2012/08/23 06:12:49 deraadt Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -109,11 +109,6 @@ cdev_decl(pci);
#include "pf.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
-
#include "ksyms.h"
#include "inet.h"
@@ -206,11 +201,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 51: nnpfs communication device */
-#else
cdev_notdef(), /* 51 */
-#endif
#ifdef USER_PCICONF
cdev_pci_init(NPCI,pci), /* 52: PCI user */
#else
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index e1a1f55f95d..c672a3702bd 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.67 2012/04/06 15:10:40 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.68 2012/08/23 06:12:49 deraadt Exp $ */
/* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */
/*-
@@ -164,11 +164,6 @@ cdev_decl(dl);
#include "ch.h"
#include "uk.h"
-#ifdef NNPFS
-#include <nnpfs/nnnpfs.h>
-cdev_decl(nnpfs_dev);
-#endif
-
#include "wsdisplay.h"
#include "wskbd.h"
#include "wsmouse.h"
@@ -257,11 +252,7 @@ struct cdevsw cdevsw[] =
cdev_disk_init(NRY,ry), /* 71: VS floppy */
cdev_bio_init(NBIO,bio), /* 72: ioctl tunnel */
cdev_notdef(), /* 73 was: RAIDframe disk driver */
-#ifdef NNPFS
- cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 74: nnpfs communication device */
-#else
cdev_notdef(), /* 74 */
-#endif
cdev_ptm_init(NPTY,ptm), /* 75: pseudo-tty ptm device */
cdev_notdef(), /* 76 */
cdev_notdef(), /* 77 */
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-29 02:10:21 +0000