aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-07 08:44:56 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-07 08:44:56 +0000
commita4ffbea09c88fbe9cefcf0080eda0809598f3ee1 (patch)
treef3261452de6d5a1c11fd8ed250f2a42f6d0eb008 /target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
parentd9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76 (diff)
downloadmaster-187ad058-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.tar.gz
master-187ad058-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.tar.bz2
master-187ad058-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.zip
[kernel] update to 2.6.25.19, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13137 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch b/target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
index 85b8cb4f91..c2d7d1c0de 100644
--- a/target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -70,6 +70,12 @@
+@@ -70,6 +70,12 @@ config ADM6996_PHY
---help---
Currently supports the ADM6996F switch
@@ -15,7 +15,7 @@
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -13,6 +13,7 @@
+@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o
obj-$(CONFIG_ADM6996_PHY) += adm6996.o
@@ -38,7 +38,7 @@
/**
* 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;