[uPATCH] duplicate pci ids

From: Peter Samuelson (peter@cadcamlab.org)
Date: Sat Dec 02 2000 - 21:50:26 EST

Next message: Theodore Y. Ts'o: "Re: /dev/random probs in 2.4test(12-pre3)"

Previous message: Horst von Brand: "2.2.18pre2[34] freezes"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/

Next message: Theodore Y. Ts'o: "Re: /dev/random probs in 2.4test(12-pre3)"
Previous message: Horst von Brand: "2.2.18pre2[34] freezes"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Sat Dec 02 2000 - 21:51:36 EST