From: John Crispin <john@openwrt.org>
Date: Mon, 28 Jan 2013 17:46:07 +0000 (+0000)
Subject: dont load gptu on ase
X-Git-Tag: reboot~11466
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a0f7a3c214162a9057e52d41f91487af0bfd8afa;p=openwrt%2Fopenwrt.git

dont load gptu on ase

fixes #12792

SVN-Revision: 35357
---

diff --git a/target/linux/lantiq/patches-3.7/0301-gptu.patch b/target/linux/lantiq/patches-3.7/0301-gptu.patch
index 77fcb68f45..35ec060ecf 100644
--- a/target/linux/lantiq/patches-3.7/0301-gptu.patch
+++ b/target/linux/lantiq/patches-3.7/0301-gptu.patch
@@ -1,6 +1,10 @@
---- /dev/null
-+++ b/arch/mips/lantiq/xway/timer.c
-@@ -0,0 +1,841 @@
+Index: linux-3.7.4/arch/mips/lantiq/xway/timer.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.4/arch/mips/lantiq/xway/timer.c	2013-01-28 18:37:52.316180918 +0100
+@@ -0,0 +1,845 @@
++#ifndef CONFIG_SOC_AMAZON_SE
++
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/version.h>
@@ -842,8 +846,12 @@
 +
 +module_init(lq_gptu_init);
 +module_exit(lq_gptu_exit);
---- /dev/null
-+++ b/arch/mips/include/asm/mach-lantiq/lantiq_timer.h
++
++#endif
+Index: linux-3.7.4/arch/mips/include/asm/mach-lantiq/lantiq_timer.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-3.7.4/arch/mips/include/asm/mach-lantiq/lantiq_timer.h	2013-01-28 18:26:14.280164283 +0100
 @@ -0,0 +1,155 @@
 +#ifndef __DANUBE_GPTU_DEV_H__2005_07_26__10_19__
 +#define __DANUBE_GPTU_DEV_H__2005_07_26__10_19__
@@ -1000,8 +1008,10 @@
 +	u32 reload, unsigned long arg1, unsigned long arg2);
 +
 +#endif /* __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ */
---- a/arch/mips/lantiq/xway/Makefile
-+++ b/arch/mips/lantiq/xway/Makefile
+Index: linux-3.7.4/arch/mips/lantiq/xway/Makefile
+===================================================================
+--- linux-3.7.4.orig/arch/mips/lantiq/xway/Makefile	2013-01-28 18:26:06.580164100 +0100
++++ linux-3.7.4/arch/mips/lantiq/xway/Makefile	2013-01-28 18:38:07.848181285 +0100
 @@ -1,3 +1,3 @@
 -obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o
 +obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o