diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 08:10:26 +0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 08:10:26 +0400 |
commit | 8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06 (patch) | |
tree | 1a081f09ebcf2a84de899ddeadd0e4c5e48b50d2 /drivers/gpio/vx855_gpio.c | |
parent | 54525552c6ccfd867e819845da14be994e303218 (diff) | |
parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) | |
download | linux-8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'drivers/gpio/vx855_gpio.c')
-rw-r--r-- | drivers/gpio/vx855_gpio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/vx855_gpio.c b/drivers/gpio/vx855_gpio.c index 8a98ee5d5f6c..ef5aabd8b8b7 100644 --- a/drivers/gpio/vx855_gpio.c +++ b/drivers/gpio/vx855_gpio.c @@ -26,6 +26,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/gpio.h> +#include <linux/slab.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/pci.h> |