diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /net/netlabel/netlabel_mgmt.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 { |