Changeset 23918


Ignore:
Timestamp:
2010-11-07T23:41:28+01:00 (5 years ago)
Author:
florian
Message:

[rdc] refresh patches, remove 015-r6040_fix_multicast.patch (upstreamed)

Location:
trunk/target/linux/rdc/patches-2.6.32
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/rdc/patches-2.6.32/009-rdc321x_select_embedded.patch

    r19826 r23918  
    11--- a/arch/x86/Kconfig 
    22+++ b/arch/x86/Kconfig 
    3 @@ -400,6 +400,8 @@ config X86_RDC321X 
     3@@ -405,6 +405,8 @@ config X86_RDC321X 
    44        depends on X86_EXTENDED_PLATFORM 
    55        select M486 
  • trunk/target/linux/rdc/patches-2.6.32/010-rdc_cpu_ident.patch

    r21475 r23918  
    7373--- a/arch/x86/Kconfig 
    7474+++ b/arch/x86/Kconfig 
    75 @@ -398,6 +398,7 @@ config X86_RDC321X 
     75@@ -403,6 +403,7 @@ config X86_RDC321X 
    7676        bool "RDC R-321x SoC" 
    7777        depends on X86_32 
  • trunk/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch

    r22851 r23918  
    11--- a/scripts/Makefile.lib 
    22+++ b/scripts/Makefile.lib 
    3 @@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)  
     3@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
    44  
    55 quiet_cmd_lzma = LZMA    $@ 
  • trunk/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch

    r22851 r23918  
    224224 /* Read/set MAC address routines */ 
    225225 static void r6040_mac_address(struct net_device *dev) 
    226 @@ -874,10 +782,6 @@ static int r6040_open(struct net_device  
     226@@ -874,10 +782,6 @@ static int r6040_open(struct net_device 
    227227        napi_enable(&lp->napi); 
    228228        netif_start_queue(dev); 
     
    235235 } 
    236236  
    237 @@ -1020,40 +924,22 @@ static void netdev_get_drvinfo(struct ne 
     237@@ -1018,40 +922,22 @@ static void netdev_get_drvinfo(struct ne 
    238238 static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
    239239 { 
     
    279279  
    280280 static const struct net_device_ops r6040_netdev_ops = { 
    281 @@ -1072,6 +958,86 @@ static const struct net_device_ops r6040 
     281@@ -1070,6 +956,86 @@ static const struct net_device_ops r6040 
    282282 #endif 
    283283 }; 
     
    366366                                         const struct pci_device_id *ent) 
    367367 { 
    368 @@ -1082,6 +1048,7 @@ static int __devinit r6040_init_one(stru 
     368@@ -1080,6 +1046,7 @@ static int __devinit r6040_init_one(stru 
    369369        static int card_idx = -1; 
    370370        int bar = 0; 
     
    374374        printk("%s\n", version); 
    375375  
    376 @@ -1169,7 +1136,6 @@ static int __devinit r6040_init_one(stru 
     376@@ -1167,7 +1134,6 @@ static int __devinit r6040_init_one(stru 
    377377        /* Init RDC private data */ 
    378378        lp->mcr0 = 0x1002; 
     
    382382        /* The RDC-specific entries in the device structure. */ 
    383383        dev->netdev_ops = &r6040_netdev_ops; 
    384 @@ -1177,28 +1143,61 @@ static int __devinit r6040_init_one(stru 
     384@@ -1175,28 +1141,61 @@ static int __devinit r6040_init_one(stru 
    385385        dev->watchdog_timeo = TX_TIMEOUT; 
    386386  
     
    452452        pci_iounmap(pdev, ioaddr); 
    453453 err_out_free_res: 
    454 @@ -1212,8 +1211,12 @@ err_out: 
     454@@ -1210,8 +1209,12 @@ err_out: 
    455455 static void __devexit r6040_remove_one(struct pci_dev *pdev) 
    456456 { 
  • trunk/target/linux/rdc/patches-2.6.32/110-rdc321x_watchdog_fix.patch

    r22851 r23918  
    6060+       .identity = "RDC321x WDT", 
    6161+}; 
    62 + 
    6362  
    6463-static void rdc321x_wdt_trigger(unsigned long unused) 
     64+ 
    6565+/* generic helper functions */ 
    6666+static void rdc321x_wdt_timer(unsigned long unused) 
Note: See TracChangeset for help on using the changeset viewer.