diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 07:40:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 07:40:56 -0400 |
| commit | 251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3 (patch) | |
| tree | 3c20c3e080f276848f2ad67aadab44a5d64bfda9 /include/linux/connector.h | |
| parent | 6679ce6e5f519096612b480d255d9ca97be0c2be (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'include/linux/connector.h')
| -rw-r--r-- | include/linux/connector.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h index 96a89d3d6727..5c7f9468f753 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
| @@ -38,8 +38,9 @@ | |||
| 38 | #define CN_W1_VAL 0x1 | 38 | #define CN_W1_VAL 0x1 |
| 39 | #define CN_IDX_V86D 0x4 | 39 | #define CN_IDX_V86D 0x4 |
| 40 | #define CN_VAL_V86D_UVESAFB 0x1 | 40 | #define CN_VAL_V86D_UVESAFB 0x1 |
| 41 | #define CN_IDX_BB 0x5 /* BlackBoard, from the TSP GPL sampling framework */ | ||
| 41 | 42 | ||
| 42 | #define CN_NETLINK_USERS 5 | 43 | #define CN_NETLINK_USERS 6 |
| 43 | 44 | ||
| 44 | /* | 45 | /* |
| 45 | * Maximum connector's message size. | 46 | * Maximum connector's message size. |