diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/mfd/ucb1x00.h | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
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) |