Merge pull request #580 from wigyori/cc-libpcap
[15.05/openwrt.git] / target / linux / adm5120 / patches-3.18 / 007-adm5120_pci.patch
1 --- a/arch/mips/pci/Makefile
2 +++ b/arch/mips/pci/Makefile
3 @@ -18,6 +18,7 @@ obj-$(CONFIG_PCI_TX4927)      += ops-tx4927.o
4  obj-$(CONFIG_BCM47XX)          += pci-bcm47xx.o
5  obj-$(CONFIG_BCM63XX)          += pci-bcm63xx.o fixup-bcm63xx.o \
6                                         ops-bcm63xx.o
7 +obj-$(CONFIG_ADM5120)          += pci-adm5120.o
8  obj-$(CONFIG_MIPS_ALCHEMY)     += pci-alchemy.o
9  obj-$(CONFIG_SOC_AR71XX)       += pci-ar71xx.o
10  obj-$(CONFIG_PCI_AR724X)       += pci-ar724x.o
11 --- a/include/linux/pci_ids.h
12 +++ b/include/linux/pci_ids.h
13 @@ -1821,6 +1821,9 @@
14  
15  #define PCI_VENDOR_ID_CB               0x1307  /* Measurement Computing */
16  
17 +#define PCI_VENDOR_ID_ADMTEK           0x1317
18 +#define PCI_DEVICE_ID_ADMTEK_ADM5120   0x5120
19 +
20  #define PCI_VENDOR_ID_SIIG             0x131f
21  #define PCI_SUBVENDOR_ID_SIIG          0x131f
22  #define PCI_DEVICE_ID_SIIG_1S_10x_550  0x1000