aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.31
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-02-20 19:31:13 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-02-20 19:31:13 +0000
commit046c32e6bf33d365e812ee5ea5ee0409d49f3d0d (patch)
tree531b6350a7fbbab42d4f946be37a107e3abf5604 /target/linux/brcm47xx/patches-2.6.31
parent42d947f5ba2c7596d9079a4408e5a6d69ad7c9e6 (diff)
downloadupstream-046c32e6bf33d365e812ee5ea5ee0409d49f3d0d.tar.gz
upstream-046c32e6bf33d365e812ee5ea5ee0409d49f3d0d.tar.bz2
upstream-046c32e6bf33d365e812ee5ea5ee0409d49f3d0d.zip
refresh patches
SVN-Revision: 19781
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.31')
-rw-r--r--target/linux/brcm47xx/patches-2.6.31/100-board_support.patch2
-rw-r--r--target/linux/brcm47xx/patches-2.6.31/210-b44_phy_fix.patch2
-rw-r--r--target/linux/brcm47xx/patches-2.6.31/220-bcm5354.patch2
-rw-r--r--target/linux/brcm47xx/patches-2.6.31/270-ehci-ssb.patch2
-rw-r--r--target/linux/brcm47xx/patches-2.6.31/800-fix_cfe_detection.patch2
5 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.31/100-board_support.patch b/target/linux/brcm47xx/patches-2.6.31/100-board_support.patch
index b7291e66b1..6fa0937d48 100644
--- a/target/linux/brcm47xx/patches-2.6.31/100-board_support.patch
+++ b/target/linux/brcm47xx/patches-2.6.31/100-board_support.patch
@@ -15,7 +15,7 @@
extern char *system_type;
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
-@@ -2085,6 +2085,7 @@
+@@ -2089,6 +2089,7 @@
#define PCI_DEVICE_ID_TIGON3_5906M 0x1713
#define PCI_DEVICE_ID_BCM4401 0x4401
#define PCI_DEVICE_ID_BCM4401B0 0x4402
diff --git a/target/linux/brcm47xx/patches-2.6.31/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.31/210-b44_phy_fix.patch
index a9f4f95620..6bf52f7bc4 100644
--- a/target/linux/brcm47xx/patches-2.6.31/210-b44_phy_fix.patch
+++ b/target/linux/brcm47xx/patches-2.6.31/210-b44_phy_fix.patch
@@ -9,7 +9,7 @@
}
static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
-@@ -2221,6 +2221,10 @@ static int __devinit b44_init_one(struct
+@@ -2217,6 +2217,10 @@ static int __devinit b44_init_one(struct
*/
b44_chip_reset(bp, B44_CHIP_RESET_FULL);
diff --git a/target/linux/brcm47xx/patches-2.6.31/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.31/220-bcm5354.patch
index 9adf48414b..0d46f82c46 100644
--- a/target/linux/brcm47xx/patches-2.6.31/220-bcm5354.patch
+++ b/target/linux/brcm47xx/patches-2.6.31/220-bcm5354.patch
@@ -31,7 +31,7 @@
}
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
-@@ -1010,6 +1010,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+@@ -1012,6 +1012,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
if (bus->chip_id == 0x5365) {
rate = 100000000;
diff --git a/target/linux/brcm47xx/patches-2.6.31/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.31/270-ehci-ssb.patch
index 5b205e0e7c..8dc3ccd026 100644
--- a/target/linux/brcm47xx/patches-2.6.31/270-ehci-ssb.patch
+++ b/target/linux/brcm47xx/patches-2.6.31/270-ehci-ssb.patch
@@ -29,7 +29,7 @@
depends on USB
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1117,8 +1117,16 @@ MODULE_LICENSE ("GPL");
+@@ -1119,8 +1119,16 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ixp4xx_ehci_driver
#endif
diff --git a/target/linux/brcm47xx/patches-2.6.31/800-fix_cfe_detection.patch b/target/linux/brcm47xx/patches-2.6.31/800-fix_cfe_detection.patch
index 6cba540530..c3a8a5738a 100644
--- a/target/linux/brcm47xx/patches-2.6.31/800-fix_cfe_detection.patch
+++ b/target/linux/brcm47xx/patches-2.6.31/800-fix_cfe_detection.patch
@@ -90,7 +90,7 @@
{
char buf[CL_SIZE];
-@@ -146,9 +122,12 @@ static __init void prom_init_mem(void)
+@@ -154,9 +130,12 @@ static __init void prom_init_mem(void)
void __init prom_init(void)
{