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/dtor/input
[pandora-kernel.git]
/
drivers
/
input
/
touchscreen
/
atmel_tsadcc.c
diff --git
a/drivers/input/touchscreen/atmel_tsadcc.c
b/drivers/input/touchscreen/atmel_tsadcc.c
index
55092d1
..
95f6785
100644
(file)
--- a/
drivers/input/touchscreen/atmel_tsadcc.c
+++ b/
drivers/input/touchscreen/atmel_tsadcc.c
@@
-22,7
+22,7
@@
#include <linux/clk.h>
#include <linux/platform_device.h>
#include <linux/io.h>
-#include <
mach/board
.h>
+#include <
linux/platform_data/atmel
.h>
#include <mach/cpu.h>
/* Register definitions based on AT91SAM9RL64 preliminary draft datasheet */