Merge bk://cifs.bkbits.net/linux-2.5cifs

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://cifs.bkbits.net/linux-2.5cifs
into ppc970.osdl.org:/home/torvalds/v2.6/linux
70a83a8c · Linus Torvalds · 62401684 · f03a6bbb · 70a83a8c · 70a83a8c
Commit 70a83a8c authored Jul 31, 2004 by Linus Torvalds
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 198 additions and 42 deletions

drivers/ide/pci/hpt366.c drivers/ide/pci/hpt366.c +197 -42

include/linux/pci_ids.h include/linux/pci_ids.h +1 -0

No files found.
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1184,6 +1184,7 @@
 #define PCI_DEVICE_ID_TTI_HPT302	0x0006
 #define PCI_DEVICE_ID_TTI_HPT371	0x0007
 #define PCI_DEVICE_ID_TTI_HPT374	0x0008
+#define PCI_DEVICE_ID_TTI_HPT372N	0x0009	// apparently a 372N variant?

 #define PCI_VENDOR_ID_VIA		0x1106
 #define PCI_DEVICE_ID_VIA_8763_0	0x0198