diff options
| author | Adrian Alonso <aalonso@freescale.com> | 2012-10-04 10:38:48 -0500 |
|---|---|---|
| committer | Terry Lv <r65388@freescale.com> | 2012-10-09 10:10:56 +0800 |
| commit | 1d488213e2eea0c09a00f7e559658f29c8b8b73d (patch) | |
| tree | 41ce0474061b22ad6f4248761ec1cf2fc23085cc /arch/arm/plat-mxc | |
| parent | b5c9198538e29e94c964b23e590d9c0761532e34 (diff) | |
ENGR00227020: devices-common imx_dma_data duplicate struct definition
* Fix imx_dma_data duplicate struct definition
* Rename struct as name conflicts with imx_dma_data
struct defined at arch/arm/plat-mxc/include/mach/dma.h
* Update copyrigth year.
Signed-off-by: Adrian Alonso <aalonso@freescale.com>
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-dma.c | 8 | ||||
| -rwxr-xr-x | arch/arm/plat-mxc/include/mach/devices-common.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-dma.c b/arch/arm/plat-mxc/devices/platform-dma.c index b2cba3db6d6d..7f731954192e 100644 --- a/arch/arm/plat-mxc/devices/platform-dma.c +++ b/arch/arm/plat-mxc/devices/platform-dma.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 2 as published by the @@ -13,19 +13,19 @@ #include <mach/devices-common.h> #ifdef CONFIG_SOC_IMX50 -const struct imx_dma_data imx50_dma_data __initconst = { +const struct imx_dma_res_data imx50_dma_res_data __initconst = { .iobase = MX50_APBHDMA_BASE_ADDR, }; #endif #ifdef CONFIG_SOC_IMX6Q -const struct imx_dma_data imx6q_dma_data __initconst = { +const struct imx_dma_res_data imx6q_dma_res_data __initconst = { .iobase = APBH_DMA_ARB_BASE_ADDR, }; #endif struct platform_device *__init imx_add_dma( - const struct imx_dma_data *data) + const struct imx_dma_res_data *data) { struct resource res[] = { { diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index ae7f8cb3ad33..1ff68bd8b6dd 100755 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h @@ -25,10 +25,10 @@ static inline struct platform_device *imx_add_platform_device( name, id, res, num_resources, data, size_data, 0); } -struct imx_dma_data { +struct imx_dma_res_data { resource_size_t iobase; }; -struct platform_device *__init imx_add_dma(const struct imx_dma_data *data); +struct platform_device *__init imx_add_dma(const struct imx_dma_res_data *data); #include <linux/fec.h> struct imx_fec_data { |