diff options
| author | Greg Kroah-Hartman | 2012-08-06 18:48:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-08-06 18:48:31 +0200 |
| commit | c87985a3ce723995fc7b25e598238d67154108a1 (patch) | |
| tree | e60def1b77c25c1d74180f62e8a5603f9826f209 /arch/arm/mach-imx/devices-imx21.h | |
| parent | tty: Fix race in tty release (diff) | |
| parent | Linux 3.6-rc1 (diff) | |
| download | kernel-qcow2-linux-c87985a3ce723995fc7b25e598238d67154108a1.tar.gz kernel-qcow2-linux-c87985a3ce723995fc7b25e598238d67154108a1.tar.xz kernel-qcow2-linux-c87985a3ce723995fc7b25e598238d67154108a1.zip | |
Merge tty-next into 3.6-rc1
This handles the merge issue in:
arch/um/drivers/line.c
arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-imx/devices-imx21.h')
| -rw-r--r-- | arch/arm/mach-imx/devices-imx21.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/devices-imx21.h b/arch/arm/mach-imx/devices-imx21.h index 2628e0c474dc..93ece55f75df 100644 --- a/arch/arm/mach-imx/devices-imx21.h +++ b/arch/arm/mach-imx/devices-imx21.h @@ -14,7 +14,7 @@ extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data; imx_add_imx21_hcd(&imx21_imx21_hcd_data, pdata) extern const struct imx_imx2_wdt_data imx21_imx2_wdt_data; -#define imx21_add_imx2_wdt(pdata) \ +#define imx21_add_imx2_wdt() \ imx_add_imx2_wdt(&imx21_imx2_wdt_data) extern const struct imx_imx_fb_data imx21_imx_fb_data; @@ -50,7 +50,7 @@ extern const struct imx_mxc_nand_data imx21_mxc_nand_data; imx_add_mxc_nand(&imx21_mxc_nand_data, pdata) extern const struct imx_mxc_w1_data imx21_mxc_w1_data; -#define imx21_add_mxc_w1(pdata) \ +#define imx21_add_mxc_w1() \ imx_add_mxc_w1(&imx21_mxc_w1_data) extern const struct imx_spi_imx_data imx21_cspi_data[]; |