diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-16 14:40:44 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 14:40:44 -0400 |
| commit | 9714d315d28aef77a097fe905b25cc273c3d72ad (patch) | |
| tree | 0ae1150b0723e925785ce774c3554f29fda050f6 /include/linux/netdevice.h | |
| parent | 84c164a34ffe67908a932a2d641ec1a80c2d5435 (diff) | |
| parent | 6ccf15a1a76d2ff915cdef6ae4d12d0170087118 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 1bca6171b1aa..46c36ffe20ee 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -790,11 +790,11 @@ struct net_device { | |||
| 790 | /* | 790 | /* |
| 791 | * This is the first field of the "visible" part of this structure | 791 | * This is the first field of the "visible" part of this structure |
| 792 | * (i.e. as seen by users in the "Space.c" file). It is the name | 792 | * (i.e. as seen by users in the "Space.c" file). It is the name |
| 793 | * the interface. | 793 | * of the interface. |
| 794 | */ | 794 | */ |
| 795 | char name[IFNAMSIZ]; | 795 | char name[IFNAMSIZ]; |
| 796 | 796 | ||
| 797 | struct pm_qos_request_list *pm_qos_req; | 797 | struct pm_qos_request_list pm_qos_req; |
| 798 | 798 | ||
| 799 | /* device name hash chain */ | 799 | /* device name hash chain */ |
| 800 | struct hlist_node name_hlist; | 800 | struct hlist_node name_hlist; |