diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 00:40:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 00:40:40 -0400 |
| commit | ae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch) | |
| tree | 9d3cedeb65db521a8436b545bd91641549a18d24 /include/net/act_generic.h | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
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; |