git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
include
/
linux
/
pci_ids.h
diff --git
a/include/linux/pci_ids.h
b/include/linux/pci_ids.h
index
ced4d3f
..
cbabb9c
100644
(file)
--- a/
include/linux/pci_ids.h
+++ b/
include/linux/pci_ids.h
@@
-2019,6
+2019,8
@@
#define PCI_VENDOR_ID_ARIMA 0x161f
+#define PCI_VENDOR_ID_BROCADE 0x1657
+
#define PCI_VENDOR_ID_SIBYTE 0x166d
#define PCI_DEVICE_ID_BCM1250_PCI 0x0001
#define PCI_DEVICE_ID_BCM1250_HT 0x0002