diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-06-02 08:22:56 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-06-02 08:22:56 +0000 |
| commit | 9ca16cf1b6246d99df192aa0131d39bb0aa31998 (patch) | |
| tree | a3141c916b391658ab197350ee398aace4ad9f35 /target/linux/generic-2.6/patches-2.6.26/640-mvswitch.patch | |
| parent | ed893cab23c6b9ffa02a6515969ceb2e5cde13c7 (diff) | |
| download | upstream-9ca16cf1b6246d99df192aa0131d39bb0aa31998.tar.gz upstream-9ca16cf1b6246d99df192aa0131d39bb0aa31998.tar.bz2 upstream-9ca16cf1b6246d99df192aa0131d39bb0aa31998.zip | |
add generic 2.6.26 patches/files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11323 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/640-mvswitch.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/640-mvswitch.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/640-mvswitch.patch b/target/linux/generic-2.6/patches-2.6.26/640-mvswitch.patch new file mode 100644 index 0000000000..85b8cb4f91 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.26/640-mvswitch.patch @@ -0,0 +1,48 @@ +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig +@@ -70,6 +70,12 @@ + ---help--- + Currently supports the ADM6996F switch + ++config MVSWITCH_PHY ++ tristate "Driver for Marvell switches" ++ select VLAN_8021Q ++ ---help--- ++ Currently supports the Marvell 88E6060 switch. ++ + config FIXED_PHY + bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" + depends on PHYLIB=y +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile +@@ -13,6 +13,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_FIXED_PHY) += fixed.o + obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o +--- a/drivers/net/phy/mdio_bus.c ++++ b/drivers/net/phy/mdio_bus.c +@@ -35,6 +35,12 @@ + #include <asm/irq.h> + #include <asm/uaccess.h> + ++static void mdio_dev_release(struct device *dev) ++{ ++ /* nothing to do */ ++} ++ ++ + /** + * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus + * @bus: target mii_bus +@@ -85,6 +91,7 @@ + + phydev->dev.parent = bus->dev; + phydev->dev.bus = &mdio_bus_type; ++ phydev->dev.release = mdio_dev_release; + snprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus->id, i); + + phydev->bus = bus; |