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 git://git.infradead.org/iommu-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p6442
/
dev-spi.c
diff --git
a/arch/arm/mach-s5p6442/dev-spi.c
b/arch/arm/mach-s5p6442/dev-spi.c
index
3019952
..
e894651
100644
(file)
--- a/
arch/arm/mach-s5p6442/dev-spi.c
+++ b/
arch/arm/mach-s5p6442/dev-spi.c
@@
-10,11
+10,11
@@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
+#include <linux/gpio.h>
#include <mach/dma.h>
#include <mach/map.h>
#include <mach/irqs.h>
-#include <mach/gpio.h>
#include <mach/spi-clocks.h>
#include <plat/s3c64xx-spi.h>