diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 22:04:42 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 22:04:42 +0100 |
| commit | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (patch) | |
| tree | 91ceaff680af17633f12d6feba4058fb70e620a5 /arch/arm/plat-mxc/include/mach/devices-common.h | |
| parent | f779b7dd3259ec138c7aba793f0602b20262af83 (diff) | |
| parent | f1de1613da54f754d5d2bbf79fcacbd5ed965537 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/devices-common.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/devices-common.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index 049897880403..86d7575a564d 100644 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h @@ -108,7 +108,11 @@ struct platform_device *__init imx_add_spi_imx( const struct spi_imx_master *pdata); #include <mach/esdhc.h> -struct platform_device *__init imx_add_esdhc(int id, - resource_size_t iobase, resource_size_t iosize, - resource_size_t irq, +struct imx_esdhc_imx_data { + int id; + resource_size_t iobase; + resource_size_t irq; +}; +struct platform_device *__init imx_add_esdhc( + const struct imx_esdhc_imx_data *data, const struct esdhc_platform_data *pdata); |