git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
gpio
/
xilinx_gpio.c
diff --git
a/drivers/gpio/xilinx_gpio.c
b/drivers/gpio/xilinx_gpio.c
index 3c1177abebd30c5b620114925faa32b5741d592d..b8fa65b5bfca56ca8320e23916d45dbc56a68b1c 100644
(file)
--- a/
drivers/gpio/xilinx_gpio.c
+++ b/
drivers/gpio/xilinx_gpio.c
@@
-19,6
+19,7
@@
#include <linux/of_gpio.h>
#include <linux/io.h>
#include <linux/gpio.h>
#include <linux/of_gpio.h>
#include <linux/io.h>
#include <linux/gpio.h>
+#include <linux/slab.h>
/* Register Offset Definitions */
#define XGPIO_DATA_OFFSET (0x0) /* Data register */
/* Register Offset Definitions */
#define XGPIO_DATA_OFFSET (0x0) /* Data register */