2000-12-03 03:21:28

by Peter Samuelson

[permalink] [raw]
Subject: [uPATCH] duplicate pci ids


A patch hunk got duplicated somewhere, it seems.

--- test12pre3/include/linux/pci_ids.h~ Sat Dec 2 19:23:51 2000
+++ test12pre3/include/linux/pci_ids.h Sat Dec 2 20:45:53 2000
@@ -406,10 +406,6 @@
#define PCI_DEVICE_ID_ELSA_MICROLINK 0x1000
#define PCI_DEVICE_ID_ELSA_QS3000 0x3000

-#define PCI_VENDOR_ID_ELSA 0x1048
-#define PCI_DEVICE_ID_ELSA_MICROLINK 0x1000
-#define PCI_DEVICE_ID_ELSA_QS3000 0x3000
-
#define PCI_VENDOR_ID_SGS 0x104a
#define PCI_DEVICE_ID_SGS_2000 0x0008
#define PCI_DEVICE_ID_SGS_1764 0x0009