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.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
dev-spi.c
diff --git
a/arch/arm/mach-s3c64xx/dev-spi.c
b/arch/arm/mach-s3c64xx/dev-spi.c
index
29c32d0
..
a492b98
100644
(file)
--- a/
arch/arm/mach-s3c64xx/dev-spi.c
+++ b/
arch/arm/mach-s3c64xx/dev-spi.c
@@
-12,10
+12,10
@@
#include <linux/string.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
+#include <linux/gpio.h>
#include <mach/dma.h>
#include <mach/map.h>
-#include <mach/gpio.h>
#include <mach/gpio-bank-c.h>
#include <mach/spi-clocks.h>