diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-08-06 09:51:55 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-08-06 09:51:55 +0000 |
| commit | 57411a3935f38a7a86e4b2aa43f9417640020db2 (patch) | |
| tree | 194910b1794e66881217b0e80c70389c72695c1b /target/linux/brcm47xx | |
| parent | 187c48dc4459c0c66b0f9976c8f37efc90790c54 (diff) | |
kernel: update to kernel version 3.0.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27918 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.0/022-USB-Add-ehci-ssb-driver.patch | 6 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.0/023-usb_ehci_ohci.patch | 4 |
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) { |