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_mgmt.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_mgmt.h')
| -rw-r--r-- | net/netlabel/netlabel_mgmt.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netlabel/netlabel_mgmt.h b/net/netlabel/netlabel_mgmt.h index 05d96431f819..0a25838bcf45 100644 --- a/net/netlabel/netlabel_mgmt.h +++ b/net/netlabel/netlabel_mgmt.h | |||
| @@ -173,7 +173,6 @@ enum { | |||
| 173 | NLBL_MGMT_C_VERSION, | 173 | NLBL_MGMT_C_VERSION, |
| 174 | __NLBL_MGMT_C_MAX, | 174 | __NLBL_MGMT_C_MAX, |
| 175 | }; | 175 | }; |
| 176 | #define NLBL_MGMT_C_MAX (__NLBL_MGMT_C_MAX - 1) | ||
| 177 | 176 | ||
| 178 | /* NetLabel Management attributes */ | 177 | /* NetLabel Management attributes */ |
| 179 | enum { | 178 | enum { |