diff options
| author | James Morris <jmorris@namei.org> | 2009-07-13 10:30:40 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-13 10:30:40 -0400 |
| commit | 7d45ecafb6792ca68da9517969d37d910601845f (patch) | |
| tree | a98b1074e5577e66a97963745f975404d0aac266 /include/linux/usb/usbnet.h | |
| parent | be940d6279c30a2d7c4e8d1d5435f957f594d66d (diff) | |
| parent | 7638d5322bd89d49e013a03fe2afaeb6d214fabd (diff) | |
Merge branch 'master' into next
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include/linux/usb/usbnet.h')
| -rw-r--r-- | include/linux/usb/usbnet.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 5d44059f6d63..310e18a880ff 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h | |||
| @@ -42,7 +42,6 @@ struct usbnet { | |||
| 42 | 42 | ||
| 43 | /* protocol/interface state */ | 43 | /* protocol/interface state */ |
| 44 | struct net_device *net; | 44 | struct net_device *net; |
| 45 | struct net_device_stats stats; | ||
| 46 | int msg_enable; | 45 | int msg_enable; |
| 47 | unsigned long data [5]; | 46 | unsigned long data [5]; |
| 48 | u32 xid; | 47 | u32 xid; |