refresh 2.6.38 patches
SVN-Revision: 31193
This commit is contained in:
		@@ -19,5 +19,5 @@
 | 
				
			|||||||
 
 | 
					 
 | 
				
			||||||
+obj-$(CONFIG_ADM5120_ENET) += adm5120sw.o
 | 
					+obj-$(CONFIG_ADM5120_ENET) += adm5120sw.o
 | 
				
			||||||
 obj-$(CONFIG_ETH16I) += eth16i.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
 | 
					 obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
 obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= msi-octeon.o
 | 
					 obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= msi-octeon.o
 | 
				
			||||||
--- a/include/linux/pci_ids.h
 | 
					--- a/include/linux/pci_ids.h
 | 
				
			||||||
+++ b/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_VENDOR_ID_ESDGMBH		0x12fe
 | 
				
			||||||
 #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
 | 
					 #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user