aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-02-11 18:16:08 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-02-11 18:16:08 +0000
commit80a535ba586708d53ecc23fa527edc61fcbdd260 (patch)
treeacab53189cd8ef0f79964862a0181df68fdf100a /target/linux
parent440a7fbc3bfd2489fd9e5eb7329557c86e34ae6d (diff)
downloadupstream-80a535ba586708d53ecc23fa527edc61fcbdd260.tar.gz
upstream-80a535ba586708d53ecc23fa527edc61fcbdd260.tar.bz2
upstream-80a535ba586708d53ecc23fa527edc61fcbdd260.zip
generic/2.6.39: refresh patches
SVN-Revision: 30458
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-2.6.39/020-ssb_update.patch4
-rw-r--r--target/linux/generic/patches-2.6.39/622-sched_sfq_fix_enqueue.patch2
-rw-r--r--target/linux/generic/patches-2.6.39/720-phy_adm6996.patch2
-rw-r--r--target/linux/generic/patches-2.6.39/722-phy_mvswitch.patch2
-rw-r--r--target/linux/generic/patches-2.6.39/723-phy_ip175c.patch2
-rw-r--r--target/linux/generic/patches-2.6.39/724-phy_ar8216.patch2
-rw-r--r--target/linux/generic/patches-2.6.39/725-phy_rtl8306.patch2
-rw-r--r--target/linux/generic/patches-2.6.39/726-phy_rtl8366.patch2
-rw-r--r--target/linux/generic/patches-2.6.39/727-phy-rtl8367.patch2
9 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic/patches-2.6.39/020-ssb_update.patch b/target/linux/generic/patches-2.6.39/020-ssb_update.patch
index 8113bca68f..d89b64b9d9 100644
--- a/target/linux/generic/patches-2.6.39/020-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.39/020-ssb_update.patch
@@ -864,7 +864,7 @@
sprom_extract_r458(out, in);
/* TODO - get remaining rev 8 stuff needed */
-@@ -662,7 +723,6 @@ static int sprom_extract(struct ssb_bus
+@@ -662,7 +723,6 @@ static int sprom_extract(struct ssb_bus
static int ssb_pci_sprom_get(struct ssb_bus *bus,
struct ssb_sprom *sprom)
{
@@ -1164,7 +1164,7 @@
/* Suspend a SSB bus.
* Call this from the parent bus suspend routine. */
-@@ -518,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct
+@@ -518,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct
* Otherwise static always-on powercontrol will be used. */
extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
diff --git a/target/linux/generic/patches-2.6.39/622-sched_sfq_fix_enqueue.patch b/target/linux/generic/patches-2.6.39/622-sched_sfq_fix_enqueue.patch
index 122f62b9e6..b849106873 100644
--- a/target/linux/generic/patches-2.6.39/622-sched_sfq_fix_enqueue.patch
+++ b/target/linux/generic/patches-2.6.39/622-sched_sfq_fix_enqueue.patch
@@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
-@@ -410,7 +410,12 @@ sfq_enqueue(struct sk_buff *skb, struct
+@@ -410,7 +410,12 @@ sfq_enqueue(struct sk_buff *skb, struct
/* Return Congestion Notification only if we dropped a packet
* from this flow.
*/
diff --git a/target/linux/generic/patches-2.6.39/720-phy_adm6996.patch b/target/linux/generic/patches-2.6.39/720-phy_adm6996.patch
index 5e1c0763ea..c61e48706a 100644
--- a/target/linux/generic/patches-2.6.39/720-phy_adm6996.patch
+++ b/target/linux/generic/patches-2.6.39/720-phy_adm6996.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -97,6 +97,13 @@ config MICREL_PHY
+@@ -101,6 +101,13 @@ config MICREL_PHY
---help---
Supports the KSZ9021, VSC8201, KS8001 PHYs.
diff --git a/target/linux/generic/patches-2.6.39/722-phy_mvswitch.patch b/target/linux/generic/patches-2.6.39/722-phy_mvswitch.patch
index 5a7b96aadd..8e056c36ed 100644
--- a/target/linux/generic/patches-2.6.39/722-phy_mvswitch.patch
+++ b/target/linux/generic/patches-2.6.39/722-phy_mvswitch.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -104,6 +104,9 @@ config ADM6996_PHY
+@@ -108,6 +108,9 @@ config ADM6996_PHY
Currently supports the ADM6996FC and ADM6996M switches.
Support for FC is very limited.
diff --git a/target/linux/generic/patches-2.6.39/723-phy_ip175c.patch b/target/linux/generic/patches-2.6.39/723-phy_ip175c.patch
index 22a56ed4dc..2b26d63101 100644
--- a/target/linux/generic/patches-2.6.39/723-phy_ip175c.patch
+++ b/target/linux/generic/patches-2.6.39/723-phy_ip175c.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -107,6 +107,10 @@ config ADM6996_PHY
+@@ -111,6 +111,10 @@ config ADM6996_PHY
config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"
diff --git a/target/linux/generic/patches-2.6.39/724-phy_ar8216.patch b/target/linux/generic/patches-2.6.39/724-phy_ar8216.patch
index c375a97292..7de939246e 100644
--- a/target/linux/generic/patches-2.6.39/724-phy_ar8216.patch
+++ b/target/linux/generic/patches-2.6.39/724-phy_ar8216.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -111,6 +111,10 @@ config IP17XX_PHY
+@@ -115,6 +115,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
diff --git a/target/linux/generic/patches-2.6.39/725-phy_rtl8306.patch b/target/linux/generic/patches-2.6.39/725-phy_rtl8306.patch
index e97b84d48c..efabdfe187 100644
--- a/target/linux/generic/patches-2.6.39/725-phy_rtl8306.patch
+++ b/target/linux/generic/patches-2.6.39/725-phy_rtl8306.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -115,6 +115,10 @@ config AR8216_PHY
+@@ -119,6 +119,10 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches"
select SWCONFIG
diff --git a/target/linux/generic/patches-2.6.39/726-phy_rtl8366.patch b/target/linux/generic/patches-2.6.39/726-phy_rtl8366.patch
index 34ac10ed39..9210984cc5 100644
--- a/target/linux/generic/patches-2.6.39/726-phy_rtl8366.patch
+++ b/target/linux/generic/patches-2.6.39/726-phy_rtl8366.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -157,4 +157,29 @@ config MDIO_OCTEON
+@@ -161,4 +161,29 @@ config MDIO_OCTEON
If in doubt, say Y.
diff --git a/target/linux/generic/patches-2.6.39/727-phy-rtl8367.patch b/target/linux/generic/patches-2.6.39/727-phy-rtl8367.patch
index 229fe7114b..c143e752bf 100644
--- a/target/linux/generic/patches-2.6.39/727-phy-rtl8367.patch
+++ b/target/linux/generic/patches-2.6.39/727-phy-rtl8367.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -175,6 +175,10 @@ config RTL8366RB_PHY
+@@ -178,6 +178,10 @@ config RTL8366RB_PHY
tristate "Driver for the Realtek RTL8366RB switch"
select SWCONFIG