diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-19 15:29:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-19 15:29:23 -0700 |
| commit | 804c64ea864d0a8ee13f3de0b74158a3e9c3166d (patch) | |
| tree | 842b223e9db75ece9f4e2a5daf0f519b07b4a92a /include | |
| parent | 49a43876b935c811cfd29d8fe998a6912a1cc5c4 (diff) | |
| parent | aa1c6a6f7f0518b42994d02756a41cbfdcac1916 (diff) | |
| download | cachepc-linux-804c64ea864d0a8ee13f3de0b74158a3e9c3166d.tar.gz cachepc-linux-804c64ea864d0a8ee13f3de0b74158a3e9c3166d.zip | |
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
Diffstat (limited to 'include')
| -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 @@ * include/net/act_generic.h * */ -#ifndef ACT_GENERIC_H -#define ACT_GENERIC_H +#ifndef _NET_ACT_GENERIC_H +#define _NET_ACT_GENERIC_H static inline int tcf_defact_release(struct tcf_defact *p, int bind) { int ret = 0; |