s3c24xx: unbreak openmoko merge patch (mmc changes)

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

diff --git a/target/linux/adm5120/patches-2.6.27/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.27/007-adm5120_pci.patch
index 63f9067..ae041fd 100644 (file)
--- a/target/linux/adm5120/patches-2.6.27/007-adm5120_pci.patch
+++ b/target/linux/adm5120/patches-2.6.27/007-adm5120_pci.patch
@@ -1,13 +1,13 @@
 --- a/arch/mips/pci/Makefile
 +++ b/arch/mips/pci/Makefile
-@@ -51,3 +51,4 @@
+@@ -51,3 +51,4 @@ obj-$(CONFIG_VICTOR_MPC30X)  += fixup-mpc
  obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
  obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o
  obj-$(CONFIG_MIKROTIK_RB532)  += pci-rc32434.o ops-rc32434.o fixup-rc32434.o
 +obj-$(CONFIG_ADM5120)         += pci-adm5120.o
 --- a/include/linux/pci_ids.h
 +++ b/include/linux/pci_ids.h
-@@ -1708,6 +1708,9 @@
+@@ -1712,6 +1712,9 @@
  #define PCI_VENDOR_ID_ESDGMBH         0x12fe
  #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111