aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-20 11:33:41 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-20 11:33:41 +0000
commit9dbf23b2c503e2d468ceca00b27cc96dd8fc30d8 (patch)
tree4da94b3fc8062cb297e08052cc32f746d362975f
parent4e56c90b05d9978381a29944472341c47821bcd3 (diff)
downloadupstream-9dbf23b2c503e2d468ceca00b27cc96dd8fc30d8.tar.gz
upstream-9dbf23b2c503e2d468ceca00b27cc96dd8fc30d8.tar.bz2
upstream-9dbf23b2c503e2d468ceca00b27cc96dd8fc30d8.zip
fix a broken patch, thanks to Giampaolo Mancini (closes #3462)
SVN-Revision: 11221
-rw-r--r--target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch10
1 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch b/target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch
index 3ab265e3c6..b32d055ad7 100644
--- a/target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch
+++ b/target/linux/ixp4xx/patches-2.6.24/032-subsume_power_files.patch
@@ -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
-@@ -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_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_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