diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
| commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
| tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /include/linux/if_link.h | |
| parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
| parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
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 7fcad2e1be3d..2fc66dd783ee 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h | |||
| @@ -234,7 +234,7 @@ enum macvlan_mode { | |||
| 234 | MACVLAN_MODE_BRIDGE = 4, /* talk to bridge ports directly */ | 234 | MACVLAN_MODE_BRIDGE = 4, /* talk to bridge ports directly */ |
| 235 | }; | 235 | }; |
| 236 | 236 | ||
| 237 | /* SR-IOV virtual function managment section */ | 237 | /* SR-IOV virtual function management section */ |
| 238 | 238 | ||
| 239 | enum { | 239 | enum { |
| 240 | IFLA_VF_INFO_UNSPEC, | 240 | IFLA_VF_INFO_UNSPEC, |