[ixp4xx] fix a broken patch, thanks to Giampaolo Mancini (closes #3462)
authorGabor Juhos <juhosg@openwrt.org>
Tue, 20 May 2008 11:33:41 +0000 (11:33 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Tue, 20 May 2008 11:33:41 +0000 (11:33 +0000)
SVN-Revision: 11221

target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch

index 3ab265e3c6eae6d67c9eccbef207e9409d96ba42..b32d055ad7ad34a327416d9d2ebbb5905850cfcd 100644 (file)
@@ -15,11 +15,15 @@ Index: linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
 ===================================================================
 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile
 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
 ===================================================================
 --- linux-2.6.24.7.orig/arch/arm/mach-ixp4xx/Makefile
 +++ linux-2.6.24.7/arch/arm/mach-ixp4xx/Makefile
-@@ -26,7 +26,7 @@ obj-$(CONFIG_ARCH_ADI_COYOTE)        += coyote-
+@@ -24,9 +24,9 @@ obj-$(CONFIG_MACH_AVILA)     += avila-setup.
+ obj-$(CONFIG_MACH_IXDPG425)   += coyote-setup.o
+ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
  obj-$(CONFIG_MACH_GTWX5715)   += gtwx5715-setup.o
  obj-$(CONFIG_MACH_GTWX5715)   += gtwx5715-setup.o
- obj-$(CONFIG_MACH_NSLU2)      += nslu2-setup.o
- obj-$(CONFIG_MACH_NAS100D)    += nas100d-setup.o
+-obj-$(CONFIG_MACH_NSLU2)      += nslu2-setup.o nslu2-power.o
+-obj-$(CONFIG_MACH_NAS100D)    += nas100d-setup.o nas100d-power.o
 -obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o dsmg600-power.o
 -obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o dsmg600-power.o
++obj-$(CONFIG_MACH_NSLU2)      += nslu2-setup.o
++obj-$(CONFIG_MACH_NAS100D)    += nas100d-setup.o
 +obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
 +obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o