diff options
author | Jonas Gorski <jogo@openwrt.org> | 2011-11-13 10:48:05 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2011-11-13 10:48:05 +0000 |
commit | d8acb75009ad7f674609664810fef3a11d72205e (patch) | |
tree | d66c7e0323af53562e5f0e4e0fd7d9ab49d3ca7a /target/linux/lantiq/patches/211-devices.patch | |
parent | a8797d0de6fac61582e9e9212e55e0bc1449f4b1 (diff) | |
download | master-31e0f0ae-d8acb75009ad7f674609664810fef3a11d72205e.tar.gz master-31e0f0ae-d8acb75009ad7f674609664810fef3a11d72205e.tar.bz2 master-31e0f0ae-d8acb75009ad7f674609664810fef3a11d72205e.zip |
linux: update 3.1 to 3.1.1
SVN-Revision: 29007
Diffstat (limited to 'target/linux/lantiq/patches/211-devices.patch')
-rw-r--r-- | target/linux/lantiq/patches/211-devices.patch | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/target/linux/lantiq/patches/211-devices.patch b/target/linux/lantiq/patches/211-devices.patch index a5561c788e..4c3f50fc87 100644 --- a/target/linux/lantiq/patches/211-devices.patch +++ b/target/linux/lantiq/patches/211-devices.patch @@ -1,7 +1,5 @@ -Index: linux-3.1/arch/mips/lantiq/devices.c -=================================================================== ---- linux-3.1.orig/arch/mips/lantiq/devices.c 2011-11-12 18:06:54.712192370 +0100 -+++ linux-3.1/arch/mips/lantiq/devices.c 2011-11-12 18:06:55.544192390 +0100 +--- a/arch/mips/lantiq/devices.c ++++ b/arch/mips/lantiq/devices.c @@ -18,6 +18,7 @@ #include <linux/time.h> #include <linux/io.h> @@ -10,7 +8,7 @@ Index: linux-3.1/arch/mips/lantiq/devices.c #include <asm/bootinfo.h> #include <asm/irq.h> -@@ -100,3 +101,20 @@ +@@ -100,3 +101,20 @@ void __init ltq_register_pci(struct ltq_ pr_err("kernel is compiled without PCI support\n"); } #endif @@ -31,21 +29,17 @@ Index: linux-3.1/arch/mips/lantiq/devices.c + cp1_base = + (void*)CPHYSADDR(dma_alloc_coherent(NULL, CP1_SIZE, &dma, GFP_ATOMIC)); +} -Index: linux-3.1/arch/mips/lantiq/devices.h -=================================================================== ---- linux-3.1.orig/arch/mips/lantiq/devices.h 2011-11-12 18:06:54.712192370 +0100 -+++ linux-3.1/arch/mips/lantiq/devices.h 2011-11-12 18:06:55.544192390 +0100 -@@ -23,5 +23,6 @@ +--- a/arch/mips/lantiq/devices.h ++++ b/arch/mips/lantiq/devices.h +@@ -23,5 +23,6 @@ extern void ltq_register_nor(struct phys extern void ltq_register_wdt(void); extern void ltq_register_asc(int port); extern void ltq_register_pci(struct ltq_pci_data *data); +extern void ltq_register_tapi(void); #endif -Index: linux-3.1/arch/mips/lantiq/xway/Makefile -=================================================================== ---- linux-3.1.orig/arch/mips/lantiq/xway/Makefile 2011-11-12 18:06:55.520192389 +0100 -+++ linux-3.1/arch/mips/lantiq/xway/Makefile 2011-11-12 18:06:55.544192390 +0100 +--- a/arch/mips/lantiq/xway/Makefile ++++ b/arch/mips/lantiq/xway/Makefile @@ -1,5 +1,7 @@ obj-y := sysctrl.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o nand.o timer.o @@ -54,10 +48,8 @@ Index: linux-3.1/arch/mips/lantiq/xway/Makefile obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o obj-$(CONFIG_SOC_VR9) += clk-vr9.o prom-vr9.o -Index: linux-3.1/arch/mips/lantiq/xway/devices.c -=================================================================== ---- linux-3.1.orig/arch/mips/lantiq/xway/devices.c 2011-11-12 18:06:55.304192384 +0100 -+++ linux-3.1/arch/mips/lantiq/xway/devices.c 2011-11-12 18:06:55.544192390 +0100 +--- a/arch/mips/lantiq/xway/devices.c ++++ b/arch/mips/lantiq/xway/devices.c @@ -19,6 +19,7 @@ #include <linux/time.h> #include <linux/io.h> @@ -66,7 +58,7 @@ Index: linux-3.1/arch/mips/lantiq/xway/devices.c #include <asm/bootinfo.h> #include <asm/irq.h> -@@ -99,3 +100,98 @@ +@@ -99,3 +100,98 @@ ltq_register_etop(struct ltq_eth_data *e platform_device_register(<q_etop); } } @@ -165,10 +157,8 @@ Index: linux-3.1/arch/mips/lantiq/xway/devices.c + ltq_spi.dev.platform_data = pdata; + platform_device_register(<q_spi); +} -Index: linux-3.1/arch/mips/lantiq/xway/devices.h -=================================================================== ---- linux-3.1.orig/arch/mips/lantiq/xway/devices.h 2011-10-24 09:10:05.000000000 +0200 -+++ linux-3.1/arch/mips/lantiq/xway/devices.h 2011-11-12 18:06:55.544192390 +0100 +--- a/arch/mips/lantiq/xway/devices.h ++++ b/arch/mips/lantiq/xway/devices.h @@ -11,10 +11,17 @@ #include "../devices.h" @@ -187,10 +177,8 @@ Index: linux-3.1/arch/mips/lantiq/xway/devices.h +extern void ltq_register_gpio_buttons(struct gpio_button *buttons, int cnt); #endif -Index: linux-3.1/arch/mips/lantiq/Makefile -=================================================================== ---- linux-3.1.orig/arch/mips/lantiq/Makefile 2011-11-12 18:06:54.780192371 +0100 -+++ linux-3.1/arch/mips/lantiq/Makefile 2011-11-12 19:52:32.700339384 +0100 +--- a/arch/mips/lantiq/Makefile ++++ b/arch/mips/lantiq/Makefile @@ -4,7 +4,7 @@ # under the terms of the GNU General Public License version 2 as published # by the Free Software Foundation. |