diff options
| author | phk <phk@FreeBSD.org> | 2003-11-03 10:19:33 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-11-03 10:19:33 +0000 |
| commit | ea16f6fe64255568efd728efc4571c9b5cd78091 (patch) | |
| tree | 28a706c77e5bf9498ce3efcdfe63319265919ff6 | |
| parent | 3d3bf229f9f16201d1c95a28bbf9145be833247a (diff) | |
| download | FreeBSD-src-ea16f6fe64255568efd728efc4571c9b5cd78091.zip FreeBSD-src-ea16f6fe64255568efd728efc4571c9b5cd78091.tar.gz | |
Free major#100
| -rw-r--r-- | sys/conf/majors | 1 | ||||
| -rw-r--r-- | sys/i386/i386/elan-mmcr.c | 4 | ||||
| -rw-r--r-- | sys/pci/xrpu.c | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/sys/conf/majors b/sys/conf/majors index cb527af..929b628 100644 --- a/sys/conf/majors +++ b/sys/conf/majors @@ -105,7 +105,6 @@ 97 *prom Alpha PROM console 98 loe Loopback pseudo-ethernet (sbabkin@dcn.att.com) 99 ct Cronyx/Tau serial adaptor -100 *xrpu Xilinx Reprogrammable Processing Unit 103 *streams SVR4 Streams emulation <newton@atdot.dotat.org> 104 *xpt CAM Transport Layer Services 105 *iic I2C bus generic i/o diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c index 67fe5f2..dd89af6 100644 --- a/sys/i386/i386/elan-mmcr.c +++ b/sys/i386/i386/elan-mmcr.c @@ -172,13 +172,11 @@ static d_mmap_t elan_mmap; #define ELAN_MMCR 0 #define ELAN_ERRLED 1 -#define CDEV_MAJOR 100 /* Share with xrpu */ static struct cdevsw elan_cdevsw = { .d_write = elan_write, .d_ioctl = elan_ioctl, .d_mmap = elan_mmap, .d_name = "elan", - .d_maj = CDEV_MAJOR, }; static void @@ -196,7 +194,7 @@ elan_drvinit(void) return; } -SYSINIT(elan, SI_SUB_PSEUDO, SI_ORDER_MIDDLE+CDEV_MAJOR,elan_drvinit,NULL); +SYSINIT(elan, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, elan_drvinit, NULL); #define LED_ON() do {elan_mmcr[0xc34 / 2] = 0x200;} while(0) #define LED_OFF() do {elan_mmcr[0xc38 / 2] = 0x200;} while(0) diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c index 08dbe82..d6c6cd3 100644 --- a/sys/pci/xrpu.c +++ b/sys/pci/xrpu.c @@ -42,14 +42,12 @@ static d_close_t xrpu_close; static d_ioctl_t xrpu_ioctl; static d_mmap_t xrpu_mmap; -#define CDEV_MAJOR 100 static struct cdevsw xrpu_cdevsw = { .d_open = xrpu_open, .d_close = xrpu_close, .d_ioctl = xrpu_ioctl, .d_mmap = xrpu_mmap, .d_name = "xrpu", - .d_maj = CDEV_MAJOR, }; static MALLOC_DEFINE(M_XRPU, "xrpu", "XRPU related"); |
