diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /include/linux/pci_ids.h | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 1f730de0df06..9438660b46ea 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2303,6 +2303,8 @@ | |||
| 2303 | #define PCI_DEVICE_ID_P2010 0x0079 | 2303 | #define PCI_DEVICE_ID_P2010 0x0079 |
| 2304 | #define PCI_DEVICE_ID_P1020E 0x0100 | 2304 | #define PCI_DEVICE_ID_P1020E 0x0100 |
| 2305 | #define PCI_DEVICE_ID_P1020 0x0101 | 2305 | #define PCI_DEVICE_ID_P1020 0x0101 |
| 2306 | #define PCI_DEVICE_ID_P1021E 0x0102 | ||
| 2307 | #define PCI_DEVICE_ID_P1021 0x0103 | ||
| 2306 | #define PCI_DEVICE_ID_P1011E 0x0108 | 2308 | #define PCI_DEVICE_ID_P1011E 0x0108 |
| 2307 | #define PCI_DEVICE_ID_P1011 0x0109 | 2309 | #define PCI_DEVICE_ID_P1011 0x0109 |
| 2308 | #define PCI_DEVICE_ID_P1022E 0x0110 | 2310 | #define PCI_DEVICE_ID_P1022E 0x0110 |