diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 00:49:13 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 00:49:13 -0400 |
| commit | 91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e (patch) | |
| tree | c96ed92413044a28d17783e84a8824bfd2437af1 /include/linux/mfd/max77693-private.h | |
| parent | b9ccfda293ee6fca9a89a1584f0900e0627b975e (diff) | |
| parent | 4dc4c51675c137c30838425ecc8d471ff5eb138b (diff) | |
Merge branch 'sh/dmaengine' into sh-latest
Diffstat (limited to 'include/linux/mfd/max77693-private.h')
| -rw-r--r-- | include/linux/mfd/max77693-private.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h index 68263c5fa53c..1eeae5c07915 100644 --- a/include/linux/mfd/max77693-private.h +++ b/include/linux/mfd/max77693-private.h | |||
| @@ -190,7 +190,6 @@ struct max77693_dev { | |||
| 190 | struct i2c_client *i2c; /* 0xCC , PMIC, Charger, Flash LED */ | 190 | struct i2c_client *i2c; /* 0xCC , PMIC, Charger, Flash LED */ |
| 191 | struct i2c_client *muic; /* 0x4A , MUIC */ | 191 | struct i2c_client *muic; /* 0x4A , MUIC */ |
| 192 | struct i2c_client *haptic; /* 0x90 , Haptic */ | 192 | struct i2c_client *haptic; /* 0x90 , Haptic */ |
| 193 | struct mutex iolock; | ||
| 194 | 193 | ||
| 195 | int type; | 194 | int type; |
| 196 | 195 | ||