diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-07-08 15:58:56 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-07-08 15:58:56 -0700 |
| commit | a448bfbd8e15bb2ed380a75f20adeb6e8d752abb (patch) | |
| tree | 1ab81f3867a5f7e0e9a6cc06fac678d670c2d464 /include/linux/connector.h | |
| parent | 2aced4d6099ce987233ab2ffad42b90800dadf09 (diff) | |
| parent | 0226f8a76da6bc97c9bb4af3fd2f6eeb03c5b0b0 (diff) | |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'include/linux/connector.h')
| -rw-r--r-- | include/linux/connector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h index 7c60d0942ad..f696bccd48c 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h @@ -44,7 +44,7 @@ #define CN_VAL_DRBD 0x1 #define CN_KVP_IDX 0x9 /* HyperV KVP */ -#define CN_NETLINK_USERS 9 +#define CN_NETLINK_USERS 10 /* Highest index + 1 */ /* * Maximum connector's message size. |