Update of /cvsroot/linux-mips/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv388/include/linux
Modified Files:
miscdevice.h pci_ids.h
Log Message:
Sync with OSS 2.4.11.
Index: miscdevice.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/miscdevice.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miscdevice.h 2001/07/09 21:50:55 1.2
+++ miscdevice.h 2001/11/06 00:30:47 1.3
@@ -23,6 +23,7 @@
#define I2O_MINOR 166
#define MICROCODE_MINOR 184
#define GPIO_MINOR 185
+#define MWAVE_MINOR 219 /* ACP/Mwave Modem */
#define MPT_MINOR 220
#define MISC_DYNAMIC_MINOR 255
Index: pci_ids.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/pci_ids.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pci_ids.h 2001/10/28 02:41:23 1.7
+++ pci_ids.h 2001/11/06 00:30:47 1.8
@@ -345,6 +345,7 @@
#define PCI_DEVICE_ID_IBM_3780IDSP 0x007d
#define PCI_DEVICE_ID_IBM_CHUKAR 0x0096
#define PCI_DEVICE_ID_IBM_405GP 0x0156
+#define PCI_DEVICE_ID_IBM_SERVERAIDI960 0x01bd
#define PCI_DEVICE_ID_IBM_MPIC_2 0xffff
#define PCI_VENDOR_ID_COMPEX2 0x101a // pci.ids says "AT&T GIS (NCR)"
@@ -639,6 +640,7 @@
#define PCI_DEVICE_ID_APPLE_KL_USB 0x0019
#define PCI_DEVICE_ID_APPLE_UNI_N_AGP 0x0020
#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC 0x0021
+#define PCI_DEVICE_ID_APPLE_UNI_N_FW2 0x0030
#define PCI_VENDOR_ID_YAMAHA 0x1073
#define PCI_DEVICE_ID_YAMAHA_724 0x0004
|
