diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-04-08 10:47:05 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-04-08 10:47:05 +0100 |
| commit | bb3c9d4f851d51bb6302ef0df830dcec88d7c529 (patch) | |
| tree | 446463d0b86dcf68b3a1538861422b1ce582de16 /arch/arm/mach-mx3/devices.h | |
| parent | d4d9959c099751158c5cf14813fe378e206339c6 (diff) | |
| parent | b3aa111f7ac1ad07009081a824b5ce7a71462c4c (diff) | |
| download | linux-bb3c9d4f851d51bb6302ef0df830dcec88d7c529.tar.gz linux-bb3c9d4f851d51bb6302ef0df830dcec88d7c529.tar.bz2 linux-bb3c9d4f851d51bb6302ef0df830dcec88d7c529.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Conflicts:
arch/arm/mach-mx3/mach-pcm037.c
Diffstat (limited to 'arch/arm/mach-mx3/devices.h')
| -rw-r--r-- | arch/arm/mach-mx3/devices.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h index 42cf175eac6b..4f77eb501274 100644 --- a/arch/arm/mach-mx3/devices.h +++ b/arch/arm/mach-mx3/devices.h @@ -25,4 +25,5 @@ extern struct platform_device mxc_spi_device1; extern struct platform_device mxc_spi_device2; extern struct platform_device imx_ssi_device0; extern struct platform_device imx_ssi_device1; - +extern struct platform_device imx_ssi_device1; +extern struct platform_device imx_wdt_device0; |