diff options
| author | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /drivers/gpio/max7300.c | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/gpio/max7300.c')
| -rw-r--r-- | drivers/gpio/max7300.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/max7300.c b/drivers/gpio/max7300.c index 9d74eef1157a..962f661c18c7 100644 --- a/drivers/gpio/max7300.c +++ b/drivers/gpio/max7300.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
| 17 | #include <linux/i2c.h> | 17 | #include <linux/i2c.h> |
| 18 | #include <linux/spi/max7301.h> | 18 | #include <linux/spi/max7301.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | static int max7300_i2c_write(struct device *dev, unsigned int reg, | 21 | static int max7300_i2c_write(struct device *dev, unsigned int reg, |
| 21 | unsigned int val) | 22 | unsigned int val) |