diff options
| author | Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | 2011-11-08 11:23:25 -0800 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | 2011-11-08 11:23:25 -0800 |
| commit | 06fcbfe20372ea53ec870591b8fe942f5a1b1c8c (patch) | |
| tree | 0d81e1947b9f4f3071b19cbdec91567aa8346bd5 /patches/14-device-type.patch | |
| parent | 6dec5d85d22c7c7b34f936d04cc230f6abb2138a (diff) | |
compat-wireless: refresh patches for next-20111108
Synchs up with next-20111108
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Diffstat (limited to 'patches/14-device-type.patch')
| -rw-r--r-- | patches/14-device-type.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch index 1a8eb0eb..8a8cdcfe 100644 --- a/patches/14-device-type.patch +++ b/patches/14-device-type.patch @@ -22,7 +22,7 @@ compile warning. unsigned long state, --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c -@@ -551,9 +551,11 @@ static struct device *bnep_get_device(st +@@ -549,9 +549,11 @@ static struct device *bnep_get_device(st return conn ? &conn->dev : NULL; } @@ -36,7 +36,7 @@ compile warning. { --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1289,13 +1289,17 @@ static const struct net_device_ops usbne +@@ -1290,13 +1290,17 @@ static const struct net_device_ops usbne // precondition: never called in_interrupt |