diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-23 02:35:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-23 02:35:16 -0700 |
| commit | c8fab1b610a781a27932e8217cda711ce79e02da (patch) | |
| tree | 136284d8992311468d840201d47683d2172a5f14 /include/linux | |
| parent | 5efa19a809ba89a6797ec48a3ae9675761f6e3d2 (diff) | |
| parent | 559b540de3d2d92c26e0753e473b4fcbd03116fd (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index e689c26b1ada..aae68c5017b6 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -271,7 +271,7 @@ struct sk_buff { #ifdef CONFIG_NET_CLS_ACT __u32 tc_verd; /* traffic control verdict */ __u32 tc_classid; /* traffic control classid */ - #endif +#endif #endif |