Changeset 45601


Ignore:
Timestamp:
2015-05-03T20:04:46+02:00 (3 years ago)
Author:
kaloz
Message:

generic/4.0: update to 4.0.1

Also refresh one patch.

Signed-off-by: Daniel Golle <daniel@…>
Signed-off-by: Imre Kaloz <kaloz@…>

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel-version.mk

    r45559 r45601  
    44 
    55LINUX_VERSION-3.18 = .11 
    6 LINUX_VERSION-4.0 = 
     6LINUX_VERSION-4.0 = .1 
    77 
    88LINUX_KERNEL_MD5SUM-3.18.11 = 2def91951c9cedf7896efb864e0c090c 
    9 LINUX_KERNEL_MD5SUM-4.0 = a86916bd12798220da9eb4a1eec3616d 
     9LINUX_KERNEL_MD5SUM-4.0.1 = ea7fc80310be8a5b43b2c6dfa5c4169f 
    1010 
    1111ifdef KERNEL_PATCHVER 
  • trunk/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch

    r45506 r45601  
    1313  
    1414 static const struct bcma_device_id bgmac_bcma_tbl[] = { 
    15 @@ -1432,6 +1433,17 @@ static void bgmac_mii_unregister(struct 
     15@@ -1538,6 +1539,17 @@ static void bgmac_mii_unregister(struct 
    1616        mdiobus_free(mii_bus); 
    1717 } 
     
    3131  * BCMA bus ops 
    3232  **************************************************/ 
    33 @@ -1551,6 +1563,16 @@ static int bgmac_probe(struct bcma_devic 
    34                 goto err_dma_free; 
    35         } 
     33@@ -1664,6 +1676,16 @@ static int bgmac_probe(struct bcma_devic 
     34        net_dev->hw_features = net_dev->features; 
     35        net_dev->vlan_features = net_dev->features; 
    3636  
    3737+       if ((ci->id == BCMA_CHIP_ID_BCM4707 || 
     
    4848        if (err) { 
    4949                bgmac_err(bgmac, "Cannot register net device\n"); 
    50 @@ -1577,6 +1599,10 @@ static void bgmac_remove(struct bcma_dev 
     50@@ -1690,6 +1712,10 @@ static void bgmac_remove(struct bcma_dev 
    5151 { 
    5252        struct bgmac *bgmac = bcma_get_drvdata(core); 
     
    6161--- a/drivers/net/ethernet/broadcom/bgmac.h 
    6262+++ b/drivers/net/ethernet/broadcom/bgmac.h 
    63 @@ -457,6 +457,9 @@ struct bgmac { 
     63@@ -462,6 +462,9 @@ struct bgmac { 
    6464        bool has_robosw; 
    6565  
Note: See TracChangeset for help on using the changeset viewer.