diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-18 20:24:51 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-18 20:24:51 +0000 |
| commit | f0c66715de5f063152d8bca967bee53ae8a0e4a3 (patch) | |
| tree | 239f266c8decd7ec360cd1fd1d7bafc53389618f /target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch | |
| parent | ff4e17bc25b735788cbe60f4c83231c47e2929f8 (diff) | |
[kernel] refresh generic 2.6.23 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11187 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch b/target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch index 15c6e481ff..7b88397063 100644 --- a/target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch +++ b/target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23.16/drivers/net/phy/Kconfig +Index: linux-2.6.23.17/drivers/net/phy/Kconfig =================================================================== ---- linux-2.6.23.16.orig/drivers/net/phy/Kconfig 2008-04-20 07:31:20.000000000 +0200 -+++ linux-2.6.23.16/drivers/net/phy/Kconfig 2008-04-20 08:57:26.000000000 +0200 -@@ -65,6 +65,12 @@ +--- linux-2.6.23.17.orig/drivers/net/phy/Kconfig ++++ linux-2.6.23.17/drivers/net/phy/Kconfig +@@ -65,6 +65,12 @@ config ADM6996_PHY ---help--- Currently supports the ADM6996F switch @@ -15,20 +15,20 @@ Index: linux-2.6.23.16/drivers/net/phy/Kconfig config FIXED_PHY tristate "Drivers for PHY emulation on fixed speed/link" ---help--- -Index: linux-2.6.23.16/drivers/net/phy/Makefile +Index: linux-2.6.23.17/drivers/net/phy/Makefile =================================================================== ---- linux-2.6.23.16.orig/drivers/net/phy/Makefile 2008-04-20 07:31:20.000000000 +0200 -+++ linux-2.6.23.16/drivers/net/phy/Makefile 2008-04-20 07:31:34.000000000 +0200 -@@ -13,4 +13,5 @@ +--- linux-2.6.23.17.orig/drivers/net/phy/Makefile ++++ linux-2.6.23.17/drivers/net/phy/Makefile +@@ -13,4 +13,5 @@ obj-$(CONFIG_VITESSE_PHY) += vitesse.o 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_FIXED_PHY) += fixed.o -Index: linux-2.6.23.16/drivers/net/phy/mdio_bus.c +Index: linux-2.6.23.17/drivers/net/phy/mdio_bus.c =================================================================== ---- linux-2.6.23.16.orig/drivers/net/phy/mdio_bus.c 2008-04-20 04:40:31.000000000 +0200 -+++ linux-2.6.23.16/drivers/net/phy/mdio_bus.c 2008-04-20 07:34:08.000000000 +0200 +--- linux-2.6.23.17.orig/drivers/net/phy/mdio_bus.c ++++ linux-2.6.23.17/drivers/net/phy/mdio_bus.c @@ -35,6 +35,12 @@ #include <asm/irq.h> #include <asm/uaccess.h> @@ -42,7 +42,7 @@ Index: linux-2.6.23.16/drivers/net/phy/mdio_bus.c /** * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus * @bus: target mii_bus -@@ -85,6 +91,7 @@ +@@ -85,6 +91,7 @@ int mdiobus_register(struct mii_bus *bus phydev->dev.parent = bus->dev; phydev->dev.bus = &mdio_bus_type; |