git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
spi
/
spi_s3c24xx.c
diff --git
a/drivers/spi/spi_s3c24xx.c
b/drivers/spi/spi_s3c24xx.c
index
1fabede
..
151a95e
100644
(file)
--- a/
drivers/spi/spi_s3c24xx.c
+++ b/
drivers/spi/spi_s3c24xx.c
@@
-21,6
+21,7
@@
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/io.h>
+#include <linux/slab.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_bitbang.h>