diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 10:46:26 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-21 10:46:26 -0400 |
| commit | 335332770c68649ffeaf5dc2b58d9cd40041e295 (patch) | |
| tree | a48e86b9f9a80913399a182a152b4c580a9c3836 /arch/arm/mach-pnx4008/serial.c | |
| 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 'arch/arm/mach-pnx4008/serial.c')
| -rw-r--r-- | arch/arm/mach-pnx4008/serial.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pnx4008/serial.c b/arch/arm/mach-pnx4008/serial.c index f40961e51914..374c138ac1ac 100644 --- a/arch/arm/mach-pnx4008/serial.c +++ b/arch/arm/mach-pnx4008/serial.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | |||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 15 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| @@ -19,8 +18,8 @@ | |||
| 19 | 18 | ||
| 20 | #include <linux/serial_core.h> | 19 | #include <linux/serial_core.h> |
| 21 | #include <linux/serial_reg.h> | 20 | #include <linux/serial_reg.h> |
| 22 | #include <mach/gpio.h> | ||
| 23 | 21 | ||
| 22 | #include <mach/gpio-pnx4008.h> | ||
| 24 | #include <mach/clock.h> | 23 | #include <mach/clock.h> |
| 25 | 24 | ||
| 26 | #define UART_3 0 | 25 | #define UART_3 0 |