From e3e087eb3d44f031448d0612f051fde52dd6dc6b Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 15 Dec 2008 14:49:40 +0000
Subject: [PATCH] [ar71xx] refresh 2.6.28 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13655 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../100-mtd_m25p80_add_pm25lv_flash_support.patch         | 2 +-
 .../ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch    | 8 ++++----
 .../102-mtd_m25p80_add_myloader_parser.patch              | 2 +-
 .../103-mtd_m25p80_add_en25p32_support.patch              | 2 +-
 .../104-mtd_m25p80_add_redboot_parser.patch               | 2 +-
 .../patches-2.6.28/802-ag71xx_mdio_dynamic_mdio_bus.patch | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/target/linux/ar71xx/patches-2.6.28/100-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/ar71xx/patches-2.6.28/100-mtd_m25p80_add_pm25lv_flash_support.patch
index 2fac990c7c..f7975f2ff4 100644
--- a/target/linux/ar71xx/patches-2.6.28/100-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/ar71xx/patches-2.6.28/100-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -500,6 +500,10 @@ static struct flash_info __devinitdata m
+@@ -503,6 +503,10 @@ static struct flash_info __devinitdata m
  	{ "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, },
  	{ "at26df321",  0x1f4701, 0, 64 * 1024, 64, SECT_4K, },
  
diff --git a/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch
index 78b9b33dba..cf1abc96f5 100644
--- a/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch
@@ -1,8 +1,8 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -83,6 +83,11 @@ config MVSWITCH_PHY
+@@ -77,6 +77,11 @@ config ADM6996_PHY
  	---help---
- 	  Currently supports the Marvell 88E6060 switch.
+ 	  Currently supports the ADM6996F switch
  
 +config MICREL_PHY
 +	tristate "Drivers for Micrel/Kendin PHYs"
@@ -14,9 +14,9 @@
  	depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
+@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY)	+= broadcom.o
+ obj-$(CONFIG_ICPLUS_PHY)	+= icplus.o
  obj-$(CONFIG_ADM6996_PHY)	+= adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
 +obj-$(CONFIG_MICREL_PHY)	+= micrel.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o
diff --git a/target/linux/ar71xx/patches-2.6.28/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.28/102-mtd_m25p80_add_myloader_parser.patch
index 0eb74e9f47..65e9154d27 100644
--- a/target/linux/ar71xx/patches-2.6.28/102-mtd_m25p80_add_myloader_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.28/102-mtd_m25p80_add_myloader_parser.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -707,12 +707,17 @@ static int __devinit m25p_probe(struct s
+@@ -711,12 +711,17 @@ static int __devinit m25p_probe(struct s
  		struct mtd_partition	*parts = NULL;
  		int			nr_parts = 0;
  
diff --git a/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25p32_support.patch b/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25p32_support.patch
index 97c2a8ff27..4d40070c4a 100644
--- a/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25p32_support.patch
+++ b/target/linux/ar71xx/patches-2.6.28/103-mtd_m25p80_add_en25p32_support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -500,6 +500,9 @@ static struct flash_info __devinitdata m
+@@ -503,6 +503,9 @@ static struct flash_info __devinitdata m
  	{ "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, },
  	{ "at26df321",  0x1f4701, 0, 64 * 1024, 64, SECT_4K, },
  
diff --git a/target/linux/ar71xx/patches-2.6.28/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.28/104-mtd_m25p80_add_redboot_parser.patch
index 6b3089c09b..ddc70cc750 100644
--- a/target/linux/ar71xx/patches-2.6.28/104-mtd_m25p80_add_redboot_parser.patch
+++ b/target/linux/ar71xx/patches-2.6.28/104-mtd_m25p80_add_redboot_parser.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -717,6 +717,9 @@ static int __devinit m25p_probe(struct s
+@@ -721,6 +721,9 @@ static int __devinit m25p_probe(struct s
  #ifdef CONFIG_MTD_MYLOADER_PARTS
  						"MyLoader",
  #endif
diff --git a/target/linux/ar71xx/patches-2.6.28/802-ag71xx_mdio_dynamic_mdio_bus.patch b/target/linux/ar71xx/patches-2.6.28/802-ag71xx_mdio_dynamic_mdio_bus.patch
index eb3514c1d6..98f7339ee9 100644
--- a/target/linux/ar71xx/patches-2.6.28/802-ag71xx_mdio_dynamic_mdio_bus.patch
+++ b/target/linux/ar71xx/patches-2.6.28/802-ag71xx_mdio_dynamic_mdio_bus.patch
@@ -68,7 +68,7 @@
  		platform_set_drvdata(pdev, NULL);
 --- a/drivers/net/ag71xx/ag71xx.h
 +++ b/drivers/net/ag71xx/ag71xx.h
-@@ -101,7 +101,7 @@ struct ag71xx_ring {
+@@ -102,7 +102,7 @@ struct ag71xx_ring {
  };
  
  struct ag71xx_mdio {
@@ -79,7 +79,7 @@
  };
 --- a/drivers/net/ag71xx/ag71xx_main.c
 +++ b/drivers/net/ag71xx/ag71xx_main.c
-@@ -807,7 +807,7 @@ static int __init ag71xx_probe(struct pl
+@@ -797,7 +797,7 @@ static int __init ag71xx_probe(struct pl
  	ag = netdev_priv(dev);
  	ag->pdev = pdev;
  	ag->dev = dev;