diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 04:16:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 04:16:43 +0100 |
| commit | 25498e5b3df931a3d52a6e0642ae242e4ee19488 (patch) | |
| tree | 5a627d71015fde644d8c61a04f7718c2f0a748db /arch/arm/mach-imx/devices-imx31.h | |
| parent | Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc (diff) | |
| parent | Merge branch 'at91/trng' into next/driver (diff) | |
| download | linux-25498e5b3df931a3d52a6e0642ae242e4ee19488.tar.xz linux-25498e5b3df931a3d52a6e0642ae242e4ee19488.zip | |
Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc
* 'next/driver' of git://git.linaro.org/people/arnd/arm-soc:
hw_random: add driver for atmel true hardware random number generator
ARM: at91: at91sam9g45: add trng clock and platform device
MX53 Enable the AHCI SATA on MX53 SMD board
MX53 Enable the AHCI SATA on MX53 LOCO board
MX53 Enable the AHCI SATA on MX53 ARD board
AHCI Add the AHCI SATA feature on the MX53 platforms
Fix pata imx resource
ARM: imx: Define functions for registering PATA
ARM: imx: Add PATA clock support
ARM: imx: Add PATA resources for other i.MX processors
imx: efika: Enable pata.
imx51: add pata clock
imx51: add pata device
Fix up trivial conflict (new selects next to each other from separate
branches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig
Diffstat (limited to 'arch/arm/mach-imx/devices-imx31.h')
| -rw-r--r-- | arch/arm/mach-imx/devices-imx31.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/devices-imx31.h b/arch/arm/mach-imx/devices-imx31.h index dbe940d9c53a..488e241a6db6 100644 --- a/arch/arm/mach-imx/devices-imx31.h +++ b/arch/arm/mach-imx/devices-imx31.h @@ -78,3 +78,7 @@ extern const struct imx_spi_imx_data imx31_cspi_data[]; #define imx31_add_spi_imx0(pdata) imx31_add_cspi(0, pdata) #define imx31_add_spi_imx1(pdata) imx31_add_cspi(1, pdata) #define imx31_add_spi_imx2(pdata) imx31_add_cspi(2, pdata) + +extern const struct imx_pata_imx_data imx31_pata_imx_data; +#define imx31_add_pata_imx() \ + imx_add_pata_imx(&imx31_pata_imx_data) |