diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /drivers/mfd/ucb1x00.h | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/mfd/ucb1x00.h')
| -rw-r--r-- | drivers/mfd/ucb1x00.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h index 9c9a647d8b7b..ca8df8072d43 100644 --- a/drivers/mfd/ucb1x00.h +++ b/drivers/mfd/ucb1x00.h | |||
| @@ -94,6 +94,7 @@ | |||
| 94 | #define UCB_ID 0x0c | 94 | #define UCB_ID 0x0c |
| 95 | #define UCB_ID_1200 0x1004 | 95 | #define UCB_ID_1200 0x1004 |
| 96 | #define UCB_ID_1300 0x1005 | 96 | #define UCB_ID_1300 0x1005 |
| 97 | #define UCB_ID_TC35143 0x9712 | ||
| 97 | 98 | ||
| 98 | #define UCB_MODE 0x0d | 99 | #define UCB_MODE 0x0d |
| 99 | #define UCB_MODE_DYN_VFLAG_ENA (1 << 12) | 100 | #define UCB_MODE_DYN_VFLAG_ENA (1 << 12) |