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 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
[pandora-kernel.git]
/
drivers
/
tty
/
serial
/
atmel_serial.c
diff --git
a/drivers/tty/serial/atmel_serial.c
b/drivers/tty/serial/atmel_serial.c
index
9988c0c
..
4a0f86f
100644
(file)
--- a/
drivers/tty/serial/atmel_serial.c
+++ b/
drivers/tty/serial/atmel_serial.c
@@
-48,7
+48,7
@@
#ifdef CONFIG_ARM
#include <mach/cpu.h>
-#include <
mach
/gpio.h>
+#include <
asm
/gpio.h>
#endif
#define PDC_BUFFER_SIZE 512