diff options
| author | Christoph Hellwig <hch@hera.kernel.org> | 2005-05-27 04:16:24 -0400 |
|---|---|---|
| committer | Christoph Hellwig <hch@melbourne.sgi.com> | 2005-05-27 04:16:24 -0400 |
| commit | b19312c4c8f3f84da57bba01d45549df1cf10dcd (patch) | |
| tree | 1c34ce89be6b4e257bc03026d0268deb17727044 /include/net/act_generic.h | |
| parent | d3870398fafd4911bd84573b78be4b6b762f32b0 (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/net/act_generic.h')
| -rw-r--r-- | include/net/act_generic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/act_generic.h b/include/net/act_generic.h index 95b120781c14..c9daa7e52300 100644 --- a/include/net/act_generic.h +++ b/include/net/act_generic.h | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | * include/net/act_generic.h | 2 | * include/net/act_generic.h |
| 3 | * | 3 | * |
| 4 | */ | 4 | */ |
| 5 | #ifndef ACT_GENERIC_H | 5 | #ifndef _NET_ACT_GENERIC_H |
| 6 | #define ACT_GENERIC_H | 6 | #define _NET_ACT_GENERIC_H |
| 7 | static inline int tcf_defact_release(struct tcf_defact *p, int bind) | 7 | static inline int tcf_defact_release(struct tcf_defact *p, int bind) |
| 8 | { | 8 | { |
| 9 | int ret = 0; | 9 | int ret = 0; |