diff options
| author | Adrian Alonso <aalonso@freescale.com> | 2012-10-04 10:38:48 -0500 |
|---|---|---|
| committer | Adrian Alonso <aalonso@freescale.com> | 2012-10-08 10:35:42 -0500 |
| commit | 885a51cc89ef0d62719104e912a03dca739d38c9 (patch) | |
| tree | 2c912a7f1e957480d46273f8c37b8c5cc7bdae6b /arch/arm/plat-mxc/include | |
| parent | 6770d5cee037cdfa80df811659e6a38c2a8a81f4 (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/include')
| -rwxr-xr-x | arch/arm/plat-mxc/include/mach/devices-common.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |