refresh 2.6.38 patches

SVN-Revision: 31193
owl
Florian Fainelli 2012-04-04 15:53:07 +00:00
parent db04bcb8e7
commit f087e07b5c
2 changed files with 2 additions and 2 deletions

View File

@ -19,5 +19,5 @@
+obj-$(CONFIG_ADM5120_ENET) += adm5120sw.o
obj-$(CONFIG_ETH16I) += eth16i.o
obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o
obj-$(CONFIG_ZORRO8390) += zorro8390.o
obj-$(CONFIG_HPLANCE) += hplance.o 7990.o

View File

@ -10,7 +10,7 @@
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1771,6 +1771,9 @@
@@ -1773,6 +1773,9 @@
#define PCI_VENDOR_ID_ESDGMBH 0x12fe
#define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111