diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-01-29 18:29:45 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-01-29 18:29:45 +0000 |
| commit | 562ba537fcd0b210f32a14a05f0cc08ca6b86d55 (patch) | |
| tree | 3963e9445bbf25e2d62cb3b26c4ab0e0daf96498 /target/linux/lantiq/patches-3.7/0301-gptu.patch | |
| parent | be55b0f3f446c40086e04dae8abd50f02b153b83 (diff) | |
| download | upstream-562ba537fcd0b210f32a14a05f0cc08ca6b86d55.tar.gz upstream-562ba537fcd0b210f32a14a05f0cc08ca6b86d55.tar.bz2 upstream-562ba537fcd0b210f32a14a05f0cc08ca6b86d55.zip | |
kernel: update linux 3.7 to 3.7.5
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35390
Diffstat (limited to 'target/linux/lantiq/patches-3.7/0301-gptu.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.7/0301-gptu.patch | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/target/linux/lantiq/patches-3.7/0301-gptu.patch b/target/linux/lantiq/patches-3.7/0301-gptu.patch index 35ec060ecf..4ecf12f6fd 100644 --- a/target/linux/lantiq/patches-3.7/0301-gptu.patch +++ b/target/linux/lantiq/patches-3.7/0301-gptu.patch @@ -1,7 +1,5 @@ -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 +--- /dev/null ++++ b/arch/mips/lantiq/xway/timer.c @@ -0,0 +1,845 @@ +#ifndef CONFIG_SOC_AMAZON_SE + @@ -848,10 +846,8 @@ Index: linux-3.7.4/arch/mips/lantiq/xway/timer.c +module_exit(lq_gptu_exit); + +#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 +--- /dev/null ++++ b/arch/mips/include/asm/mach-lantiq/lantiq_timer.h @@ -0,0 +1,155 @@ +#ifndef __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ +#define __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ @@ -1008,10 +1004,8 @@ Index: linux-3.7.4/arch/mips/include/asm/mach-lantiq/lantiq_timer.h + u32 reload, unsigned long arg1, unsigned long arg2); + +#endif /* __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ */ -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 +--- a/arch/mips/lantiq/xway/Makefile ++++ b/arch/mips/lantiq/xway/Makefile @@ -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 |