diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 16:46:26 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 16:46:26 +0200 |
commit | 335332770c68649ffeaf5dc2b58d9cd40041e295 (patch) | |
tree | a48e86b9f9a80913399a182a152b4c580a9c3836 /drivers/tty | |
parent | 3b3c281073288ebdc6161108bdc4c9f1b08bdee3 (diff) | |
parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) |
Merge branch 'depends/rmk/gpio' into next/board
Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/board-usb-a9263.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/atmel_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index b922f5d2e61e..caba6730a943 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -46,7 +46,7 @@ #ifdef CONFIG_ARM #include <mach/cpu.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #endif #define PDC_BUFFER_SIZE 512 |