diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
| commit | dcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch) | |
| tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/722-phy_mvswitch.patch | |
| parent | 59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff) | |
| download | upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2 upstream-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip | |
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/722-phy_mvswitch.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/722-phy_mvswitch.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/722-phy_mvswitch.patch b/target/linux/generic/patches-3.6/722-phy_mvswitch.patch index 8a456117fa..7aa9ee4e1d 100644 --- a/target/linux/generic/patches-3.6/722-phy_mvswitch.patch +++ b/target/linux/generic/patches-3.6/722-phy_mvswitch.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -113,6 +113,10 @@ config ADM6996_PHY +@@ -123,6 +123,10 @@ config ADM6996_PHY Currently supports the ADM6996FC and ADM6996M switches. Support for FC is very limited. @@ -13,8 +13,8 @@ depends on PHYLIB=y --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -17,6 +17,7 @@ obj-$(CONFIG_BROADCOM_PHY) += broadcom.o - obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o +@@ -18,6 +18,7 @@ obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o + obj-$(CONFIG_BCM87XX_PHY) += bcm87xx.o obj-$(CONFIG_ICPLUS_PHY) += icplus.o obj-$(CONFIG_ADM6996_PHY) += adm6996.o +obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o |