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 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
[pandora-kernel.git]
/
arch
/
arm
/
common
/
scoop.c
diff --git
a/arch/arm/common/scoop.c
b/arch/arm/common/scoop.c
index
a07b0e7
..
1cde34a
100644
(file)
--- a/
arch/arm/common/scoop.c
+++ b/
arch/arm/common/scoop.c
@@
-12,11
+12,11
@@
*/
#include <linux/device.h>
+#include <linux/gpio.h>
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/io.h>
-#include <asm/gpio.h>
#include <asm/hardware/scoop.h>
/* PCMCIA to Scoop linkage