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/ohad/hwspinlock
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
dm646x.c
diff --git
a/arch/arm/mach-davinci/dm646x.c
b/arch/arm/mach-davinci/dm646x.c
index
b0c350a
..
0b68ed5
100644
(file)
--- a/
arch/arm/mach-davinci/dm646x.c
+++ b/
arch/arm/mach-davinci/dm646x.c
@@
-13,7
+13,6
@@
#include <linux/clk.h>
#include <linux/serial_8250.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/serial_8250.h>
#include <linux/platform_device.h>
-#include <linux/gpio.h>
#include <asm/mach/map.h>
#include <asm/mach/map.h>
@@
-27,6
+26,7
@@
#include <mach/serial.h>
#include <mach/common.h>
#include <mach/asp.h>
#include <mach/serial.h>
#include <mach/common.h>
#include <mach/asp.h>
+#include <mach/gpio-davinci.h>
#include "clock.h"
#include "mux.h"
#include "clock.h"
#include "mux.h"