diff options
| author | phk <phk@FreeBSD.org> | 2005-02-27 22:11:02 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2005-02-27 22:11:02 +0000 |
| commit | 1b493208f12f4435469b2c75543f6a781481989c (patch) | |
| tree | 08873a2083275a0cee252280386e3e2c6db47625 | |
| parent | 6a03d678b56dd1e552e08673744a4c5999c97f01 (diff) | |
| download | FreeBSD-src-1b493208f12f4435469b2c75543f6a781481989c.zip FreeBSD-src-1b493208f12f4435469b2c75543f6a781481989c.tar.gz | |
Use dynamic major number allocation.
| -rw-r--r-- | sys/conf/majors | 1 | ||||
| -rw-r--r-- | sys/dev/pci/pci_user.c | 7 | ||||
| -rw-r--r-- | sys/dev/tga/tga_pci.c | 1 | ||||
| -rw-r--r-- | sys/opencrypto/cryptodev.c | 2 |
4 files changed, 0 insertions, 11 deletions
diff --git a/sys/conf/majors b/sys/conf/majors index 9e3e5a0..6e1b3f1 100644 --- a/sys/conf/majors +++ b/sys/conf/majors @@ -42,7 +42,6 @@ 74 *ccd concatenated disk 76 scc IBM Smart Capture Card (ohashi@mickey.ai.kyutech.ac.jp) 77 - - -78 pci PCI bus 79 *ipl IP Filter 80 xdcp Assigned to Chris Ficklin <chris@serengeti.com> 83 can CAN16-2 CAN-PC Interface diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c index b14abe1..6311c9c 100644 --- a/sys/dev/pci/pci_user.c +++ b/sys/dev/pci/pci_user.c @@ -67,12 +67,6 @@ static int pci_conf_match(struct pci_match_conf *matches, int num_matches, struct pci_conf *match_buf); static d_ioctl_t pci_ioctl; -#if __FreeBSD_version < 500000 -#define PCI_CDEV 78 -#else -#define PCI_CDEV MAJOR_AUTO -#endif - struct cdevsw pcicdev = { .d_version = D_VERSION, .d_flags = D_NEEDGIANT, @@ -80,7 +74,6 @@ struct cdevsw pcicdev = { .d_close = pci_close, .d_ioctl = pci_ioctl, .d_name = "pci", - .d_maj = PCI_CDEV, }; static int diff --git a/sys/dev/tga/tga_pci.c b/sys/dev/tga/tga_pci.c index 63f9c5a..ffa5deb 100644 --- a/sys/dev/tga/tga_pci.c +++ b/sys/dev/tga/tga_pci.c @@ -105,7 +105,6 @@ static struct cdevsw tga_cdevsw = { .d_ioctl = pcigfb_ioctl, .d_mmap = pcigfb_mmap, .d_name = "tga", - .d_maj = -1, }; #endif /* FB_INSTALL_CDEV */ diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index 0581076..1a33fc0 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -777,7 +777,6 @@ cryptoioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread return (error); } -#define CRYPTO_MAJOR 70 /* from openbsd */ static struct cdevsw crypto_cdevsw = { .d_version = D_VERSION, .d_flags = D_NEEDGIANT, @@ -786,7 +785,6 @@ static struct cdevsw crypto_cdevsw = { .d_write = cryptowrite, .d_ioctl = cryptoioctl, .d_name = "crypto", - .d_maj = CRYPTO_MAJOR, }; static struct cdev *crypto_dev; |
