backport acx100 2.6.24 fixes from SVN

[openwrt.git] / target / linux / adm5120 / patches-2.6.23 / 007-adm5120_pci.patch

diff --git a/target/linux/adm5120/patches-2.6.23/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.23/007-adm5120_pci.patch
index 5e9fded..d44bd2d 100644 (file)
--- a/target/linux/adm5120/patches-2.6.23/007-adm5120_pci.patch
+++ b/target/linux/adm5120/patches-2.6.23/007-adm5120_pci.patch
@@ -1,17 +1,17 @@
-Index: linux-2.6.23/arch/mips/pci/Makefile
+Index: linux-2.6.23.14/arch/mips/pci/Makefile
 ===================================================================
---- linux-2.6.23.orig/arch/mips/pci/Makefile
-+++ linux-2.6.23/arch/mips/pci/Makefile
+--- linux-2.6.23.14.orig/arch/mips/pci/Makefile
++++ linux-2.6.23.14/arch/mips/pci/Makefile
 @@ -46,3 +46,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938)       += fixup-
  obj-$(CONFIG_VICTOR_MPC30X)   += fixup-mpc30x.o
  obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
  obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o
 +obj-$(CONFIG_PCI_ADM5120)     += pci-adm5120.o
-Index: linux-2.6.23/include/linux/pci_ids.h
+Index: linux-2.6.23.14/include/linux/pci_ids.h
 ===================================================================
---- linux-2.6.23.orig/include/linux/pci_ids.h
-+++ linux-2.6.23/include/linux/pci_ids.h
-@@ -1690,6 +1690,9 @@
+--- linux-2.6.23.14.orig/include/linux/pci_ids.h
++++ linux-2.6.23.14/include/linux/pci_ids.h
+@@ -1698,6 +1698,9 @@
  #define PCI_VENDOR_ID_ESDGMBH         0x12fe
  #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111