diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 02:28:35 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 02:28:35 -0400 |
| commit | 57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch) | |
| tree | ee9289f0898054474b7e5054abdb3ffb78666436 /include/linux/mfd/da9052/da9052.h | |
| parent | 486c8aba39e5f194519cd5c0e85e5d1de8b74b03 (diff) | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
Merge commit 'v3.4-rc4' into next
Diffstat (limited to 'include/linux/mfd/da9052/da9052.h')
| -rw-r--r-- | include/linux/mfd/da9052/da9052.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/mfd/da9052/da9052.h b/include/linux/mfd/da9052/da9052.h index 5702d1be13b4..7ffbd6e9e7fc 100644 --- a/include/linux/mfd/da9052/da9052.h +++ b/include/linux/mfd/da9052/da9052.h | |||
| @@ -76,8 +76,6 @@ enum da9052_chip_id { | |||
| 76 | struct da9052_pdata; | 76 | struct da9052_pdata; |
| 77 | 77 | ||
| 78 | struct da9052 { | 78 | struct da9052 { |
| 79 | struct mutex io_lock; | ||
| 80 | |||
| 81 | struct device *dev; | 79 | struct device *dev; |
| 82 | struct regmap *regmap; | 80 | struct regmap *regmap; |
| 83 | 81 | ||