diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-16 18:40:44 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 18:40:44 (GMT) |
| commit | 9714d315d28aef77a097fe905b25cc273c3d72ad (patch) | |
| tree | 0ae1150b0723e925785ce774c3554f29fda050f6 /include/linux/if_link.h | |
| parent | 84c164a34ffe67908a932a2d641ec1a80c2d5435 (diff) | |
| parent | 6ccf15a1a76d2ff915cdef6ae4d12d0170087118 (diff) | |
| download | linux-fsl-qoriq-9714d315d28aef77a097fe905b25cc273c3d72ad.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/linux/if_link.h')
| -rw-r--r-- | include/linux/if_link.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 7fcad2e..2fc66dd 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -234,7 +234,7 @@ enum macvlan_mode { MACVLAN_MODE_BRIDGE = 4, /* talk to bridge ports directly */ }; -/* SR-IOV virtual function managment section */ +/* SR-IOV virtual function management section */ enum { IFLA_VF_INFO_UNSPEC, |