summaryrefslogtreecommitdiff
path: root/target/linux/adm5120
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-04 15:53:07 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-04 15:53:07 +0000
commitafad2e49db69cb47e70e08d72b14f2119b955f76 (patch)
tree1c4b95c81a81c03533f322ce6647a35ddf680281 /target/linux/adm5120
parent0432b2b9b938198359cb9e980a72358278f047bb (diff)
[adm5120] refresh 2.6.38 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31193 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120')
-rw-r--r--target/linux/adm5120/patches-2.6.38/003-adm5120_switch.patch2
-rw-r--r--target/linux/adm5120/patches-2.6.38/007-adm5120_pci.patch2
2 files changed, 2 insertions, 2 deletions
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