From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 4 Apr 2012 15:53:07 +0000 (+0000)
Subject: refresh 2.6.38 patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f087e07b5cdd8a042d1f9530e9a909268a87b2a5;p=openwrt%2Fstaging%2Fnbd.git

refresh 2.6.38 patches

SVN-Revision: 31193
---

diff --git a/target/linux/adm5120/patches-2.6.38/003-adm5120_switch.patch b/target/linux/adm5120/patches-2.6.38/003-adm5120_switch.patch
index 30347ae0ca..90c4a3774c 100644
--- a/target/linux/adm5120/patches-2.6.38/003-adm5120_switch.patch
+++ b/target/linux/adm5120/patches-2.6.38/003-adm5120_switch.patch
@@ -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
diff --git a/target/linux/adm5120/patches-2.6.38/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.38/007-adm5120_pci.patch
index 43f3b13317..8a9a2d451b 100644
--- a/target/linux/adm5120/patches-2.6.38/007-adm5120_pci.patch
+++ b/target/linux/adm5120/patches-2.6.38/007-adm5120_pci.patch
@@ -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