diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /include/linux/connector.h | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'include/linux/connector.h')
| -rw-r--r-- | include/linux/connector.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h index ad1a22c1c42e..4c02119c6ab9 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
| @@ -34,8 +34,11 @@ | |||
| 34 | #define CN_VAL_PROC 0x1 | 34 | #define CN_VAL_PROC 0x1 |
| 35 | #define CN_IDX_CIFS 0x2 | 35 | #define CN_IDX_CIFS 0x2 |
| 36 | #define CN_VAL_CIFS 0x1 | 36 | #define CN_VAL_CIFS 0x1 |
| 37 | #define CN_W1_IDX 0x3 /* w1 communication */ | ||
| 38 | #define CN_W1_VAL 0x1 | ||
| 37 | 39 | ||
| 38 | #define CN_NETLINK_USERS 1 | 40 | |
| 41 | #define CN_NETLINK_USERS 4 | ||
| 39 | 42 | ||
| 40 | /* | 43 | /* |
| 41 | * Maximum connector's message size. | 44 | * Maximum connector's message size. |