aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-08-06 09:51:55 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-08-06 09:51:55 +0000
commit51be98465569784b3c8c327a4873a7e9d1e5184b (patch)
tree6a6427004da9a068aa1b743847aaa240d0c6b095 /target/linux/brcm47xx
parentb043b26b54da58342b320102225203ecf5c94d07 (diff)
downloadupstream-51be98465569784b3c8c327a4873a7e9d1e5184b.tar.gz
upstream-51be98465569784b3c8c327a4873a7e9d1e5184b.tar.bz2
upstream-51be98465569784b3c8c327a4873a7e9d1e5184b.zip
kernel: update to kernel version 3.0.1
SVN-Revision: 27918
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/Makefile2
-rw-r--r--target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch6
-rw-r--r--target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch4
3 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index 969dfe2ce7..167d9e4ecb 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=brcm47xx
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb pcmcia
-LINUX_VERSION:=3.0
+LINUX_VERSION:=3.0.1
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram
diff --git a/target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch b/target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch
index d236fcbbbe..bd51587543 100644
--- a/target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch
+++ b/target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch
@@ -22,7 +22,7 @@
depends on USB
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1286,9 +1286,14 @@ MODULE_LICENSE ("GPL");
+@@ -1284,9 +1284,14 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_grlib_driver
#endif
@@ -38,7 +38,7 @@
#error "missing bus glue for ehci-hcd"
#endif
-@@ -1348,10 +1353,20 @@ static int __init ehci_hcd_init(void)
+@@ -1346,10 +1351,20 @@ static int __init ehci_hcd_init(void)
if (retval < 0)
goto clean4;
#endif
@@ -60,7 +60,7 @@
clean4:
#endif
#ifdef OF_PLATFORM_DRIVER
-@@ -1382,6 +1397,9 @@ module_init(ehci_hcd_init);
+@@ -1380,6 +1395,9 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{
diff --git a/target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch b/target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch
index a3ec2b70d0..ed444548be 100644
--- a/target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch
+++ b/target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch
@@ -152,7 +152,7 @@
+#endif
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1354,17 +1354,21 @@ static int __init ehci_hcd_init(void)
+@@ -1352,17 +1352,21 @@ static int __init ehci_hcd_init(void)
goto clean4;
#endif
@@ -174,7 +174,7 @@
#ifdef XILINX_OF_PLATFORM_DRIVER
platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
clean4:
-@@ -1397,9 +1401,11 @@ module_init(ehci_hcd_init);
+@@ -1395,9 +1399,11 @@ module_init(ehci_hcd_init);
static void __exit ehci_hcd_cleanup(void)
{