generic/2.6.39: refresh patches

SVN-Revision: 30458
owl
Gabor Juhos 2012-02-11 18:16:08 +00:00
parent 440a7fbc3b
commit 80a535ba58
9 changed files with 10 additions and 10 deletions

View File

@ -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);

View File

@ -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.
*/

View File

@ -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.

View File

@ -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.

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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