aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-09-10 13:37:34 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-09-10 13:37:34 +0000
commitfee7b3530cd4403cbf7e19eac0330964c98e0e13 (patch)
treeea9243498fe7c8c01ff7b702f5c93a13724d36f0
parentc7d90d3dc43870a939cfb4a2271d7fe01464df58 (diff)
downloadupstream-fee7b3530cd4403cbf7e19eac0330964c98e0e13.tar.gz
upstream-fee7b3530cd4403cbf7e19eac0330964c98e0e13.tar.bz2
upstream-fee7b3530cd4403cbf7e19eac0330964c98e0e13.zip
ar71xx: refresh patches
SVN-Revision: 17559
-rw-r--r--target/linux/ar71xx/patches-2.6.28/101-ksz8041_phy_driver.patch8
-rw-r--r--target/linux/ar71xx/patches-2.6.30/003-ar71xx_usb_host.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.30/110-usb-ehci-add-war-for-synopsys-hc-bug.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch4
-rw-r--r--target/linux/ar71xx/patches-2.6.31/005-ar71xx_mac_driver.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch4
6 files changed, 11 insertions, 11 deletions
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 af3cb345e5..861a98ef16 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,7 +1,7 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -88,6 +88,11 @@ config AR8216_PHY
- tristate "Driver for Atheros AR8216 switches"
+@@ -92,6 +92,11 @@ config RTL8306_PHY
+ tristate "Driver for Realtek RTL8306S switches"
select SWCONFIG
+config MICREL_PHY
@@ -14,9 +14,9 @@
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
- obj-$(CONFIG_IP175C_PHY) += ip175c.o
+@@ -19,6 +19,7 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
+ obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
+obj-$(CONFIG_MICREL_PHY) += micrel.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
diff --git a/target/linux/ar71xx/patches-2.6.30/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.30/003-ar71xx_usb_host.patch
index 78bdba7cbe..4a08987bec 100644
--- a/target/linux/ar71xx/patches-2.6.30/003-ar71xx_usb_host.patch
+++ b/target/linux/ar71xx/patches-2.6.30/003-ar71xx_usb_host.patch
@@ -30,7 +30,7 @@
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1072,6 +1072,11 @@ MODULE_LICENSE ("GPL");
+@@ -1075,6 +1075,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ixp4xx_ehci_driver
#endif
diff --git a/target/linux/ar71xx/patches-2.6.30/110-usb-ehci-add-war-for-synopsys-hc-bug.patch b/target/linux/ar71xx/patches-2.6.30/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
index ff4c594a02..a34155a205 100644
--- a/target/linux/ar71xx/patches-2.6.30/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
+++ b/target/linux/ar71xx/patches-2.6.30/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
@@ -1,6 +1,6 @@
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
-@@ -1082,6 +1082,9 @@ static void end_unlink_async (struct ehc
+@@ -1127,6 +1127,9 @@ static void end_unlink_async (struct ehc
ehci->reclaim = NULL;
start_unlink_async (ehci, next);
}
diff --git a/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch b/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch
index d96a874ba1..03f9dd27f4 100644
--- a/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch
+++ b/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/ar71xx/devices.c
+++ b/arch/mips/ar71xx/devices.c
-@@ -792,6 +792,8 @@ static struct platform_device ar71xx_dsa
+@@ -790,6 +790,8 @@ static struct platform_device ar71xx_dsa
void __init ar71xx_add_device_dsa(unsigned int id,
struct dsa_platform_data *d)
{
@@ -9,7 +9,7 @@
switch (id) {
case 0:
d->netdev = &ar71xx_eth0_device.dev;
-@@ -805,7 +807,10 @@ void __init ar71xx_add_device_dsa(unsign
+@@ -803,7 +805,10 @@ void __init ar71xx_add_device_dsa(unsign
id);
return;
}
diff --git a/target/linux/ar71xx/patches-2.6.31/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.31/005-ar71xx_mac_driver.patch
index 1ebd790535..043a3ec2c3 100644
--- a/target/linux/ar71xx/patches-2.6.31/005-ar71xx_mac_driver.patch
+++ b/target/linux/ar71xx/patches-2.6.31/005-ar71xx_mac_driver.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
-@@ -2101,6 +2101,8 @@ config ACENIC_OMIT_TIGON_I
+@@ -2103,6 +2103,8 @@ config ACENIC_OMIT_TIGON_I
The safe and default value for this is N.
diff --git a/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch b/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
index d96a874ba1..03f9dd27f4 100644
--- a/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
+++ b/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/ar71xx/devices.c
+++ b/arch/mips/ar71xx/devices.c
-@@ -792,6 +792,8 @@ static struct platform_device ar71xx_dsa
+@@ -790,6 +790,8 @@ static struct platform_device ar71xx_dsa
void __init ar71xx_add_device_dsa(unsigned int id,
struct dsa_platform_data *d)
{
@@ -9,7 +9,7 @@
switch (id) {
case 0:
d->netdev = &ar71xx_eth0_device.dev;
-@@ -805,7 +807,10 @@ void __init ar71xx_add_device_dsa(unsign
+@@ -803,7 +805,10 @@ void __init ar71xx_add_device_dsa(unsign
id);
return;
}