diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-24 13:05:22 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-24 13:05:22 +0000 |
| commit | eb0c0200624c487af549aca9eddb722413dbc1cd (patch) | |
| tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/729-phy-tantos.patch | |
| parent | 8b3c85ca8244eec0d01eea269922d780f73ccebb (diff) | |
[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/729-phy-tantos.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/729-phy-tantos.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/729-phy-tantos.patch b/target/linux/generic/patches-3.6/729-phy-tantos.patch index 0466d94b4..931447923 100644 --- a/target/linux/generic/patches-3.6/729-phy-tantos.patch +++ b/target/linux/generic/patches-3.6/729-phy-tantos.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -206,3 +206,8 @@ endif # PHYLIB +@@ -239,3 +239,8 @@ endif # PHYLIB config MICREL_KS8995MA tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch" depends on SPI @@ -11,8 +11,8 @@ + select ETHERNET_PACKET_MANGLE --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -28,6 +28,7 @@ obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb - obj-$(CONFIG_RTL8367_PHY) += rtl8367.o +@@ -30,6 +30,7 @@ obj-$(CONFIG_RTL8367_PHY) += rtl8367.o + obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o obj-$(CONFIG_MICREL_PHY) += micrel.o +obj-$(CONFIG_PSB6970_PHY) += psb6970.o |