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 | 7e856e5a97966fe89f6336783c0c676eb999e7cf (patch) | |
| tree | b5ea6efbf3f80d929729070d75c06b9a4cfe9eea /target/linux/generic/patches-3.6/720-phy_adm6996.patch | |
| parent | 4eda974038a1d09f9a73973566f72ebfd4ce556a (diff) | |
| download | upstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.gz upstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.bz2 upstream-7e856e5a97966fe89f6336783c0c676eb999e7cf.zip | |
make all 3.6 patches apply and build
SVN-Revision: 33911
Diffstat (limited to 'target/linux/generic/patches-3.6/720-phy_adm6996.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/720-phy_adm6996.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/720-phy_adm6996.patch b/target/linux/generic/patches-3.6/720-phy_adm6996.patch index c99824a6b0..0ec5ed579d 100644 --- a/target/linux/generic/patches-3.6/720-phy_adm6996.patch +++ b/target/linux/generic/patches-3.6/720-phy_adm6996.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -106,6 +106,13 @@ config MICREL_PHY +@@ -116,6 +116,13 @@ config MICREL_PHY ---help--- Supports the KSZ9021, VSC8201, KS8001 PHYs. @@ -16,9 +16,9 @@ depends on PHYLIB=y --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -16,6 +16,7 @@ obj-$(CONFIG_VITESSE_PHY) += vitesse.o - obj-$(CONFIG_BROADCOM_PHY) += broadcom.o +@@ -17,6 +17,7 @@ obj-$(CONFIG_BROADCOM_PHY) += broadcom.o 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_REALTEK_PHY) += realtek.o |