[kernel] backport two changes from kernel.org:

[openwrt.git] / target / linux / ixp4xx / patches-2.6.36 / 130-wrt300nv2_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.36/130-wrt300nv2_support.patch b/target/linux/ixp4xx/patches-2.6.36/130-wrt300nv2_support.patch
index c184a6c..865bb9d 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.36/130-wrt300nv2_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.36/130-wrt300nv2_support.patch
@@ -17,7 +17,7 @@
        help
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
-@@ -20,6 +20,7 @@ obj-pci-$(CONFIG_MACH_FSG)           += fsg-pci.o
+@@ -21,6 +21,7 @@ obj-pci-$(CONFIG_MACH_ARCOM_VULCAN)  += v
  obj-pci-$(CONFIG_MACH_PRONGHORN)      += pronghorn-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)     += sidewinder-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
@@ -25,7 +25,7 @@
  
  obj-y += common.o
  
-@@ -39,6 +40,7 @@ obj-$(CONFIG_MACH_GORAMO_MLR)        += goramo_
+@@ -41,6 +42,7 @@ obj-$(CONFIG_MACH_ARCOM_VULCAN)      += vulca
  obj-$(CONFIG_MACH_PRONGHORN)  += pronghorn-setup.o
  obj-$(CONFIG_MACH_SIDEWINDER) += sidewinder-setup.o
  obj-$(CONFIG_MACH_COMPEX)     += compex-setup.o