kernel: refresh patches

SVN-Revision: 22252
This commit is contained in:
Hauke Mehrtens
2010-07-17 14:10:39 +00:00
parent 1d7a6ebc79
commit c5ef57706d
49 changed files with 151 additions and 151 deletions

View File

@@ -19,7 +19,7 @@
struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
{
struct phy_device *dev;
@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str
@@ -176,6 +188,8 @@ struct phy_device* phy_device_create(str
dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr);
dev->state = PHY_DOWN;
@@ -30,7 +30,7 @@
INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -325,6 +325,20 @@ struct phy_device {
@@ -330,6 +330,20 @@ struct phy_device {
void (*adjust_link)(struct net_device *dev);
void (*adjust_state)(struct net_device *dev);
@@ -53,7 +53,7 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -863,6 +863,7 @@ struct net_device {
@@ -932,6 +932,7 @@ struct net_device {
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */