[ar7] refresh patches
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 31 Aug 2010 14:08:58 +0000 (14:08 +0000)
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 31 Aug 2010 14:08:58 +0000 (14:08 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22849 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/ar7/patches-2.6.32/920-ar7part.patch
target/linux/ar7/patches-2.6.32/930-titan-platform.patch
target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch

index 8495855..9846635 100644 (file)
@@ -26,7 +26,7 @@
  static int create_mtd_partitions(struct mtd_info *master,
                                 struct mtd_partition **pparts,
                                 unsigned long origin)
-@@ -57,6 +63,16 @@ static int create_mtd_partitions(struct
+@@ -57,6 +63,16 @@ static int create_mtd_partitions(struct 
        int retries = 10;
        struct mtd_partition *ar7_parts;
  
index 2678876..cf6966d 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ar7/platform.c
 +++ b/arch/mips/ar7/platform.c
-@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[]
+@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[] 
        },
  };
  
@@ -37,7 +37,7 @@
  static struct resource vlynq_low_res[] = {
        {
                .name = "regs",
-@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[]
+@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[] 
        },
  };
  
  
  static struct gpio_led default_leds[] = {
        {
-@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] =
+@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] = 
        },
  };
  
index 84bba9b..d47ef38 100644 (file)
@@ -45,7 +45,7 @@
  
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
-@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct
+@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct 
                goto fail;
        }
  
index 0058220..102b829 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
-@@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct
+@@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct 
        }
  
        if (phy_id == PHY_MAX_ADDR) {
index 0e72267..c6cdc06 100644 (file)
@@ -47,7 +47,7 @@
        res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
-@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct
+@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct 
  
        pdata = pdev->dev.platform_data;
  
index 754119a..ea13bb1 100644 (file)
@@ -17,7 +17,7 @@
  static int __devinit cpmac_probe(struct platform_device *pdev)
  {
        int rc, phy_id;
-@@ -1127,10 +1124,8 @@ static int __devinit cpmac_probe(struct
+@@ -1127,10 +1124,8 @@ static int __devinit cpmac_probe(struct 
        }
        
        if (phy_id == PHY_MAX_ADDR) {