diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
| commit | 0134e89c7bcc9fde1da962c82a120691e185619f (patch) | |
| tree | 3e03335cf001019a2687d161e956de4f73379984 /net/netlabel/netlabel_unlabeled.h | |
| parent | c7066f70d9610df0b9406cc635fc09e86136e714 (diff) | |
| parent | 6faee60a4e82075853a437831768cc9e2e563e4e (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
Conflicts:
net/ipv4/route.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netlabel/netlabel_unlabeled.h')
| -rw-r--r-- | net/netlabel/netlabel_unlabeled.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netlabel/netlabel_unlabeled.h b/net/netlabel/netlabel_unlabeled.h index 7aba63595137..0bc8dc3f9e3c 100644 --- a/net/netlabel/netlabel_unlabeled.h +++ b/net/netlabel/netlabel_unlabeled.h | |||
| @@ -180,7 +180,6 @@ enum { | |||
| 180 | NLBL_UNLABEL_C_STATICLISTDEF, | 180 | NLBL_UNLABEL_C_STATICLISTDEF, |
| 181 | __NLBL_UNLABEL_C_MAX, | 181 | __NLBL_UNLABEL_C_MAX, |
| 182 | }; | 182 | }; |
| 183 | #define NLBL_UNLABEL_C_MAX (__NLBL_UNLABEL_C_MAX - 1) | ||
| 184 | 183 | ||
| 185 | /* NetLabel Unlabeled attributes */ | 184 | /* NetLabel Unlabeled attributes */ |
| 186 | enum { | 185 | enum { |