kernel: update linux 3.3 to 3.3.3

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31460 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 13 insertions, 17 deletions

diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index 71b967c07..3151fb88f 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -14,7 +14,7 @@ FEATURES:=squashfs jffs2 targz ext2 usb
 CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves
 SUBTARGETS:=9g20 9260 9263
 
-LINUX_VERSION:=3.3.2
+LINUX_VERSION:=3.3.3
 DEVICE_TYPE=
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/at91/patches/700-tqma9263-support.patch b/target/linux/at91/patches/700-tqma9263-support.patch
index 649d0d77d..321fe59a4 100644
--- a/target/linux/at91/patches/700-tqma9263-support.patch
+++ b/target/linux/at91/patches/700-tqma9263-support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-at91/Kconfig
 +++ b/arch/arm/mach-at91/Kconfig
-@@ -318,6 +318,12 @@ config MACH_NEOCORE926
+@@ -335,6 +335,12 @@ config MACH_NEOCORE926
  	help
  	  Select this if you are using the Adeneo Neocore 926 board.
  
@@ -15,9 +15,9 @@
  # ----------------------------------------------------------
 --- a/arch/arm/mach-at91/Makefile
 +++ b/arch/arm/mach-at91/Makefile
-@@ -56,6 +56,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar
+@@ -58,6 +58,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar
  obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
- obj-$(CONFIG_MACH_USB_A9263)	+= board-usb-a9263.o
+ obj-$(CONFIG_MACH_USB_A9263)	+= board-usb-a926x.o
  obj-$(CONFIG_MACH_NEOCORE926)	+= board-neocore926.o
 +obj-$(CONFIG_MACH_TQMA9263)	+= board-tqma9263.o
  
diff --git a/target/linux/at91/patches/805-free_some_portc_pins.patch b/target/linux/at91/patches/805-free_some_portc_pins.patch
index e3d6ffd5a..df8e50a03 100755..100644
--- a/target/linux/at91/patches/805-free_some_portc_pins.patch
+++ b/target/linux/at91/patches/805-free_some_portc_pins.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-at91/at91sam9260_devices.c
 +++ b/arch/arm/mach-at91/at91sam9260_devices.c
-@@ -571,7 +571,7 @@ static struct platform_device at91sam926
+@@ -579,7 +579,7 @@ static struct platform_device at91sam926
  	.num_resources	= ARRAY_SIZE(spi1_resources),
  };
  
diff --git a/target/linux/at91/patches/900-AT91-Add-external-RTC-for-Flexibity-board.patch b/target/linux/at91/patches/900-AT91-Add-external-RTC-for-Flexibity-board.patch
index 3216969a7..2b67be1e4 100644
--- a/target/linux/at91/patches/900-AT91-Add-external-RTC-for-Flexibity-board.patch
+++ b/target/linux/at91/patches/900-AT91-Add-external-RTC-for-Flexibity-board.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c
-===================================================================
---- linux-2.6.37.6.orig/arch/arm/mach-at91/board-flexibity.c	2011-05-07 10:07:03.112684983 +0100
-+++ linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c	2011-05-07 10:07:33.480684982 +0100
+--- a/arch/arm/mach-at91/board-flexibity.c
++++ b/arch/arm/mach-at91/board-flexibity.c
 @@ -1,7 +1,7 @@
  /*
   * linux/arch/arm/mach-at91/board-flexibity.c
@@ -11,8 +9,8 @@ Index: linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c
   *  Copyright (C) 2005 SAN People
   *  Copyright (C) 2006 Atmel
   *
-@@ -65,6 +65,13 @@
- 	.pullup_pin	= 0,		/* pull-up driven by UDC */
+@@ -62,6 +62,13 @@ static struct at91_udc_data __initdata f
+ 	.pullup_pin	= -EINVAL,		/* pull-up driven by UDC */
  };
  
 +/* I2C devices */
@@ -25,7 +23,7 @@ Index: linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c
  /* SPI devices */
  static struct spi_board_info flexibity_spi_devices[] = {
  	{	/* DataFlash chip */
-@@ -143,6 +150,9 @@
+@@ -141,6 +148,9 @@ static void __init flexibity_board_init(
  	at91_add_device_usbh(&flexibity_usbh_data);
  	/* USB Device */
  	at91_add_device_udc(&flexibity_udc_data);
diff --git a/target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch b/target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch
index de7a8dca3..59f9bb30e 100644
--- a/target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch
+++ b/target/linux/at91/patches/901-AT91-flexibity-default-leds-to-heartbeat.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.39/arch/arm/mach-at91/board-flexibity.c
-===================================================================
---- linux-2.6.39.orig/arch/arm/mach-at91/board-flexibity.c	2011-06-17 11:02:11.335016002 +0100
-+++ linux-2.6.39/arch/arm/mach-at91/board-flexibity.c	2011-06-17 11:02:20.395016002 +0100
-@@ -96,49 +96,49 @@
+--- a/arch/arm/mach-at91/board-flexibity.c
++++ b/arch/arm/mach-at91/board-flexibity.c
+@@ -94,49 +94,49 @@ static struct gpio_led flexibity_leds[]
  		.name			= "usb1:green",
  		.gpio			= AT91_PIN_PA12,
  		.active_low		= 1,