diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:17:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:17:34 +0200 |
| commit | a32750c2ca6f697903b19063fc86f4272865e3a1 (patch) | |
| tree | 57a23806c5358855eb426c006c88943afa683b1b /arch/arm/plat-mxc/include/mach/devices-common.h | |
| parent | 318007e9001349db9b4fcd49e9e79a7636dba7a9 (diff) | |
| parent | d870ea1d6bc5057f2599416655b42ab192dae6d0 (diff) | |
| download | blackbird-op-linux-a32750c2ca6f697903b19063fc86f4272865e3a1.tar.gz blackbird-op-linux-a32750c2ca6f697903b19063fc86f4272865e3a1.zip | |
Merge branches 'imx/pata' and 'imx/sata' into next/driver
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
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, 10 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index 4cbad45edc15..117a381fe3d5 100644 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h @@ -309,3 +309,13 @@ struct platform_device *__init imx_add_spi_imx( struct platform_device *imx_add_imx_dma(void); struct platform_device *imx_add_imx_sdma(char *name, resource_size_t iobase, int irq, struct sdma_platform_data *pdata); + +#include <linux/ahci_platform.h> +struct imx_ahci_imx_data { + const char *devid; + resource_size_t iobase; + resource_size_t irq; +}; +struct platform_device *__init imx_add_ahci_imx( + const struct imx_ahci_imx_data *data, + const struct ahci_platform_data *pdata); |
