diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 14:59:58 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 14:59:58 -0700 |
| commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
| tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /drivers/mfd/wm8350-i2c.c | |
| parent | e08cae4181af9483b04ecfac48f01c8e5a5f27bf (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
| download | kernel-crypto-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.gz kernel-crypto-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz kernel-crypto-d7be0ce6afb1df60bc786f57410407ceae92b994.zip | |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'drivers/mfd/wm8350-i2c.c')
| -rw-r--r-- | drivers/mfd/wm8350-i2c.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c index 8d8c9321757..65830f57c09 100644 --- a/drivers/mfd/wm8350-i2c.c +++ b/drivers/mfd/wm8350-i2c.c @@ -19,6 +19,7 @@ #include <linux/i2c.h> #include <linux/platform_device.h> #include <linux/mfd/wm8350/core.h> +#include <linux/slab.h> static int wm8350_i2c_read_device(struct wm8350 *wm8350, char reg, int bytes, void *dest) |