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 'next' of git://git.infradead.org/users/vkoul/slave-dma
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
board-trout-mmc.c
diff --git
a/arch/arm/mach-msm/board-trout-mmc.c
b/arch/arm/mach-msm/board-trout-mmc.c
index
f7a9724
..
8650342
100644
(file)
--- a/
arch/arm/mach-msm/board-trout-mmc.c
+++ b/
arch/arm/mach-msm/board-trout-mmc.c
@@
-1,7
+1,7
@@
/* linux/arch/arm/mach-msm/board-trout-mmc.c
** Author: Brian Swetland <swetland@google.com>
*/
/* linux/arch/arm/mach-msm/board-trout-mmc.c
** Author: Brian Swetland <swetland@google.com>
*/
-
+#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
@@
-11,7
+11,6
@@
#include <linux/err.h>
#include <linux/debugfs.h>
#include <linux/err.h>
#include <linux/debugfs.h>
-#include <asm/gpio.h>
#include <asm/io.h>
#include <mach/vreg.h>
#include <asm/io.h>
#include <mach/vreg.h>