[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / ar71xx / patches-2.6.29 / 101-ksz8041_phy_driver.patch

diff --git a/target/linux/ar71xx/patches-2.6.29/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.29/101-ksz8041_phy_driver.patch
index eec8796..bd467d8 100644 (file)
--- a/target/linux/ar71xx/patches-2.6.29/101-ksz8041_phy_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.29/101-ksz8041_phy_driver.patch
@@ -1,8 +1,8 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig

-@@ -96,6 +96,11 @@ config ADM6996_PHY
- config MVSWITCH_PHY
-       tristate "Driver for Marvell 88E6060 switches"
+@@ -104,6 +104,11 @@ config AR8216_PHY
+       tristate "Driver for Atheros AR8216 switches"
+       select SWCONFIG

  
 +config MICREL_PHY
 +      tristate "Drivers for Micrel/Kendin PHYs"
  
 +config MICREL_PHY
 +      tristate "Drivers for Micrel/Kendin PHYs"


@@ -14,8 +14,8 @@
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile
        depends on PHYLIB=y
 --- a/drivers/net/phy/Makefile
 +++ b/drivers/net/phy/Makefile

-@@ -17,6 +17,7 @@ obj-$(CONFIG_ADM6996_PHY)    += adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY)    += mvswitch.o
+@@ -19,6 +19,7 @@ obj-$(CONFIG_IP175C_PHY)     += ip175c.o
+ obj-$(CONFIG_AR8216_PHY)      += ar8216.o

  obj-$(CONFIG_REALTEK_PHY)     += realtek.o
  obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
 +obj-$(CONFIG_MICREL)          += micrel.o
  obj-$(CONFIG_REALTEK_PHY)     += realtek.o
  obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
 +obj-$(CONFIG_MICREL)          += micrel.o