diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:25:41 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:25:41 -0400 |
| commit | 3e965b176341b78620f7404fd8b7f9a0d061f8a2 (patch) | |
| tree | a2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 /arch/arm/mach-davinci/dm646x.c | |
| parent | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 (diff) | |
| parent | 5839fec9d8db35b2b07359b18a77295418e239ad (diff) | |
Merge branch 'next/fixes' into next/cleanup
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Diffstat (limited to 'arch/arm/mach-davinci/dm646x.c')
| -rw-r--r-- | arch/arm/mach-davinci/dm646x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index b0c350a02484..0b68ed534f8e 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/clk.h> | 13 | #include <linux/clk.h> |
| 14 | #include <linux/serial_8250.h> | 14 | #include <linux/serial_8250.h> |
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/gpio.h> | ||
| 17 | 16 | ||
| 18 | #include <asm/mach/map.h> | 17 | #include <asm/mach/map.h> |
| 19 | 18 | ||
| @@ -27,6 +26,7 @@ | |||
| 27 | #include <mach/serial.h> | 26 | #include <mach/serial.h> |
| 28 | #include <mach/common.h> | 27 | #include <mach/common.h> |
| 29 | #include <mach/asp.h> | 28 | #include <mach/asp.h> |
| 29 | #include <mach/gpio-davinci.h> | ||
| 30 | 30 | ||
| 31 | #include "clock.h" | 31 | #include "clock.h" |
| 32 | #include "mux.h" | 32 | #include "mux.h" |