aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/208-fix-mach-easy98000.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-01 07:56:55 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-01 07:56:55 +0000
commitd87efd8c3c2acd5d0f96b25514282a84f425419f (patch)
tree1d89c8f9fb694414d9ae46d89bddf584f94c9b00 /target/linux/lantiq/patches-3.2/208-fix-mach-easy98000.patch
parent1a395bd290a84223da5d915b7e38b6ca23d14c09 (diff)
downloadupstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.gz
upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.bz2
upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.zip
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic). SVN-Revision: 31158
Diffstat (limited to 'target/linux/lantiq/patches-3.2/208-fix-mach-easy98000.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/208-fix-mach-easy98000.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/lantiq/patches-3.2/208-fix-mach-easy98000.patch b/target/linux/lantiq/patches-3.2/208-fix-mach-easy98000.patch
index 021bb88e4c..e1593bc755 100644
--- a/target/linux/lantiq/patches-3.2/208-fix-mach-easy98000.patch
+++ b/target/linux/lantiq/patches-3.2/208-fix-mach-easy98000.patch
@@ -1,7 +1,5 @@
-Index: linux-3.2.9/arch/mips/lantiq/falcon/mach-easy98000.c
-===================================================================
---- linux-3.2.9.orig/arch/mips/lantiq/falcon/mach-easy98000.c 2012-03-07 19:30:22.000000000 +0100
-+++ linux-3.2.9/arch/mips/lantiq/falcon/mach-easy98000.c 2012-03-07 19:35:47.804810934 +0100
+--- a/arch/mips/lantiq/falcon/mach-easy98000.c
++++ b/arch/mips/lantiq/falcon/mach-easy98000.c
@@ -17,10 +17,11 @@
#include <linux/spi/eeprom.h>
#include <falcon/lantiq_soc.h>
@@ -33,7 +31,7 @@ Index: linux-3.2.9/arch/mips/lantiq/falcon/mach-easy98000.c
static struct mtd_partition easy98000_nor_partitions[] =
{
-@@ -70,7 +80,7 @@
+@@ -70,7 +80,7 @@ static struct spi_board_info easy98000_s
.platform_data = &easy98000_spi_flash_platform_data
};
@@ -42,7 +40,7 @@ Index: linux-3.2.9/arch/mips/lantiq/falcon/mach-easy98000.c
{
.name = "easy98000:green:0",
.gpio = EASY98000_GPIO_LED_0,
-@@ -104,12 +114,11 @@
+@@ -104,12 +114,11 @@ static struct gpio_led easy98000_leds_gp
static struct dm9000_plat_data dm9000_plat_data = {
.flags = DM9000_PLATF_8BITONLY,
@@ -57,7 +55,7 @@ Index: linux-3.2.9/arch/mips/lantiq/falcon/mach-easy98000.c
[2] = {
/* with irq (210 -> gpio 110) the driver is very unreliable */
.start = -1, /* use polling */
-@@ -214,8 +223,8 @@
+@@ -214,8 +223,8 @@ easy98000_init_common(void)
falcon_register_i2c();
platform_device_register(&easy98000_i2c_gpio_device);
register_davicom();