diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/mfd/htc-i2cpld.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/mfd/htc-i2cpld.c')
| -rw-r--r-- | drivers/mfd/htc-i2cpld.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c index 37b9fdab4f36..594c9a8e25e1 100644 --- a/drivers/mfd/htc-i2cpld.c +++ b/drivers/mfd/htc-i2cpld.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <linux/htcpld.h> | 36 | #include <linux/htcpld.h> |
| 37 | #include <linux/gpio.h> | 37 | #include <linux/gpio.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | struct htcpld_chip { | 40 | struct htcpld_chip { |
| 40 | spinlock_t lock; | 41 | spinlock_t lock; |