diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-06 03:32:05 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-06 03:32:05 +0200 |
commit | eabe7b01c249c9d8166a1a10bb6effce2b3de665 (patch) | |
tree | 31f1ca0c0f6d027839d3d5915cf890400a52168a /drivers/tty | |
parent | [media] ARM: EXYNOS: Change MIPI-CSIS device regulator supply names (diff) | |
parent | ARM: samsung: move platform_data definitions (diff) | |
download | linux-eabe7b01c249c9d8166a1a10bb6effce2b3de665.tar.xz linux-eabe7b01c249c9d8166a1a10bb6effce2b3de665.zip |
Merge branch 'samsung_platform_data' into staging/for_v3.7
* samsung_platform_data:
ARM: samsung: move platform_data definitions
ARM: orion: move platform_data definitions
ARM: nomadik: move platform_data definitions
ARM: w90x900: move platform_data definitions
ARM: vt8500: move platform_data definitions
ARM: tegra: move sdhci platform_data definition
ARM: sa1100: move platform_data definitions
ARM: pxa: move platform_data definitions
ARM: netx: move platform_data definitions
ARM: msm: move platform_data definitions
ARM: imx: move platform_data definitions
ARM: ep93xx: move platform_data definitions
ARM: davinci: move platform_data definitions
ARM: at91: move platform_data definitions
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index e309e8b0aaba..92d11789d6bd 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -51,7 +51,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <mach/imx-uart.h> +#include <linux/platform_data/serial-imx.h> /* Register definitions */ #define URXD0 0x0 /* Receiver Register */ |