mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-01-23 07:31:06 +02:00
generic/2.6.39: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30458 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
06d33a010d
commit
8aed6bf98c
@ -864,7 +864,7 @@
|
|||||||
sprom_extract_r458(out, in);
|
sprom_extract_r458(out, in);
|
||||||
|
|
||||||
/* TODO - get remaining rev 8 stuff needed */
|
/* 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,
|
static int ssb_pci_sprom_get(struct ssb_bus *bus,
|
||||||
struct ssb_sprom *sprom)
|
struct ssb_sprom *sprom)
|
||||||
{
|
{
|
||||||
@ -1164,7 +1164,7 @@
|
|||||||
|
|
||||||
/* Suspend a SSB bus.
|
/* Suspend a SSB bus.
|
||||||
* Call this from the parent bus suspend routine. */
|
* 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. */
|
* Otherwise static always-on powercontrol will be used. */
|
||||||
extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
|
extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
|
|
||||||
--- a/net/sched/sch_sfq.c
|
--- a/net/sched/sch_sfq.c
|
||||||
+++ b/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
|
/* Return Congestion Notification only if we dropped a packet
|
||||||
* from this flow.
|
* from this flow.
|
||||||
*/
|
*/
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/drivers/net/phy/Kconfig
|
+++ b/drivers/net/phy/Kconfig
|
||||||
@@ -97,6 +97,13 @@ config MICREL_PHY
|
@@ -101,6 +101,13 @@ config MICREL_PHY
|
||||||
---help---
|
---help---
|
||||||
Supports the KSZ9021, VSC8201, KS8001 PHYs.
|
Supports the KSZ9021, VSC8201, KS8001 PHYs.
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/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.
|
Currently supports the ADM6996FC and ADM6996M switches.
|
||||||
Support for FC is very limited.
|
Support for FC is very limited.
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/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
|
config MVSWITCH_PHY
|
||||||
tristate "Driver for Marvell 88E6060 switches"
|
tristate "Driver for Marvell 88E6060 switches"
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/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"
|
tristate "Driver for IC+ IP17xx switches"
|
||||||
select SWCONFIG
|
select SWCONFIG
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/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"
|
tristate "Driver for Atheros AR8216 switches"
|
||||||
select SWCONFIG
|
select SWCONFIG
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/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.
|
If in doubt, say Y.
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/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"
|
tristate "Driver for the Realtek RTL8366RB switch"
|
||||||
select SWCONFIG
|
select SWCONFIG
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user