diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 21:57:42 +0300 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 21:57:42 +0300 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /arch/arm/mach-davinci/serial.c | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
| download | linux-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.xz | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'arch/arm/mach-davinci/serial.c')
| -rw-r--r-- | arch/arm/mach-davinci/serial.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c index c530c7333d0a..7ce5ba086575 100644 --- a/arch/arm/mach-davinci/serial.c +++ b/arch/arm/mach-davinci/serial.c @@ -28,14 +28,8 @@ #include <linux/clk.h> #include <linux/io.h> -#include <asm/irq.h> -#include <mach/hardware.h> #include <mach/serial.h> -#include <mach/irqs.h> #include <mach/cputype.h> -#include <mach/common.h> - -#include "clock.h" static inline unsigned int serial_read_reg(struct plat_serial8250_port *up, int offset) |