From e51f7c5d1b373e49b9c482b7b0227853a2975085 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 30 Apr 2012 08:38:11 +0000
Subject: kernel: update linux 3.3 to 3.3.4

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31541 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/brcm63xx/Makefile                                          | 2 +-
 .../402-ehci-add-driver-for-bcm63xx-integrated-controller.patch         | 2 +-
 target/linux/brcm63xx/patches-3.3/501-board-NB4.patch                   | 2 +-
 target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch            | 2 +-
 target/linux/brcm63xx/patches-3.3/800-wl_exports.patch                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'target/linux/brcm63xx')

diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index 5f64ee7c0..f00704bd3 100644
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@@ -10,7 +10,7 @@ ARCH:=mips
 BOARD:=brcm63xx
 BOARDNAME:=Broadcom BCM63xx
 FEATURES:=squashfs jffs2 usb atm pci pcmcia
-LINUX_VERSION:=3.3.3
+LINUX_VERSION:=3.3.4
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/brcm63xx/patches-3.3/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch b/target/linux/brcm63xx/patches-3.3/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch
index b4de9fa53..3319e752b 100644
--- a/target/linux/brcm63xx/patches-3.3/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch
+++ b/target/linux/brcm63xx/patches-3.3/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch
@@ -226,7 +226,7 @@ Subject: [PATCH 25/63] ehci: add driver for bcm63xx integrated controller.
 +MODULE_ALIAS("platform:bcm63xx_ehci");
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
-@@ -1376,6 +1376,11 @@ MODULE_LICENSE ("GPL");
+@@ -1381,6 +1381,11 @@ MODULE_LICENSE ("GPL");
  #define        PLATFORM_DRIVER         ehci_mv_driver
  #endif
  
diff --git a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
index e1e85ba83..0ac69f156 100644
--- a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
@@ -2,7 +2,7 @@
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
 @@ -17,6 +17,9 @@
  #include <linux/ssb/ssb.h>
- #include <linux/gpio_buttons.h>
+ #include <linux/gpio_keys.h>
  #include <linux/input.h>
 +#include <linux/spi/spi.h>
 +#include <linux/spi/spi_gpio.h>
diff --git a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
index b6bf40f63..480c0f739 100644
--- a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
@@ -110,4 +110,4 @@
 +	struct gpio_led leds[14];
  
  	/* Buttons */
- 	struct gpio_button buttons[4];
+ 	struct gpio_keys_button buttons[4];
diff --git a/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch b/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch
index b9fcf26c5..85e0c7640 100644
--- a/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch
+++ b/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch
@@ -2,7 +2,7 @@
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
 @@ -17,6 +17,7 @@
  #include <linux/ssb/ssb.h>
- #include <linux/gpio_buttons.h>
+ #include <linux/gpio_keys.h>
  #include <linux/input.h>
 +#include <linux/export.h>
  #include <linux/spi/spi.h>
-- 
cgit v1.2.3