aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-04-23 12:23:21 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-04-23 12:23:21 +0000
commit90cd9b70a3f5c1d69867ed9083c39d1a5ee5a3dd (patch)
tree43d4f0b9d9bfd149babced2f362529daef3b2619 /target/linux
parent7a0c00a0116567a08ec65d069e911f9921270f91 (diff)
downloadupstream-90cd9b70a3f5c1d69867ed9083c39d1a5ee5a3dd.tar.gz
upstream-90cd9b70a3f5c1d69867ed9083c39d1a5ee5a3dd.tar.bz2
upstream-90cd9b70a3f5c1d69867ed9083c39d1a5ee5a3dd.zip
refresh kernel patches
SVN-Revision: 15347
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar71xx/patches-2.6.28/003-ar71xx_usb_host.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch10
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ar71xx/patches-2.6.28/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.28/003-ar71xx_usb_host.patch
index 8392f48ef4..43bd4a152b 100644
--- a/target/linux/ar71xx/patches-2.6.28/003-ar71xx_usb_host.patch
+++ b/target/linux/ar71xx/patches-2.6.28/003-ar71xx_usb_host.patch
@@ -28,7 +28,7 @@
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1034,6 +1034,11 @@ MODULE_LICENSE ("GPL");
+@@ -1036,6 +1036,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ixp4xx_ehci_driver
#endif
diff --git a/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch
index cf1abc96f5..1170b0c839 100644
--- a/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch
@@ -1,8 +1,8 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -77,6 +77,11 @@ config ADM6996_PHY
- ---help---
- Currently supports the ADM6996F switch
+@@ -80,6 +80,11 @@ config ADM6996_PHY
+ config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches"
+config MICREL_PHY
+ tristate "Drivers for Micrel/Kendin PHYs"
@@ -14,9 +14,9 @@
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
- obj-$(CONFIG_ICPLUS_PHY) += icplus.o
+@@ -16,6 +16,7 @@ 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_MICREL_PHY) += micrel.o
obj-$(CONFIG_FIXED_PHY) += fixed.o