diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2004-08-22 08:46:20 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2004-08-22 08:46:20 -0400 |
| commit | 633980ae8596e9f9e548a3e213b7801f19020fc3 (patch) | |
| tree | d62b528a44c7625da5ae492966b3351780941dbd /include | |
| parent | 752b4f6730a74c629f648adb3046d7c4445cb85c (diff) | |
| parent | 997037cccca30be1af6b42e6d0f7ffb3c64ebfd0 (diff) | |
| download | history-633980ae8596e9f9e548a3e213b7801f19020fc3.tar.gz | |
Merge pobox.com:/spare/repo/linux-2.6
into pobox.com:/spare/repo/netdev-2.6/ALL
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mv643xx.h (renamed from include/asm-mips/mv64340.h) | 0 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/mv64340.h b/include/linux/mv643xx.h index a889dd9788ffe8..a889dd9788ffe8 100644 --- a/include/asm-mips/mv64340.h +++ b/include/linux/mv643xx.h diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 50a747035c0515..0ca0b5068bc240 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1234,6 +1234,7 @@ #define PCI_DEVICE_ID_VIA_8233C_0 0x3109 #define PCI_DEVICE_ID_VIA_8361 0x3112 #define PCI_DEVICE_ID_VIA_XM266 0x3116 +#define PCI_DEVICE_ID_VIA_612X 0x3119 #define PCI_DEVICE_ID_VIA_862X_0 0x3123 #define PCI_DEVICE_ID_VIA_8753_0 0x3128 #define PCI_DEVICE_ID_VIA_8233A 0x3147 |