diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-20 23:43:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-20 23:43:18 +0100 |
| commit | 9bfe99a8f95122f83f3c894b1071b61e2b6d4990 (patch) | |
| tree | e322752b04deb314b579cae2c5c9993453775823 /arch/arm/mach-mx3/mach-pcm037.c | |
| parent | f72caf7e496465182eeda842ac66a5e75404ddf1 (diff) | |
| parent | 54c1f6367c2836a85e821a010085ed04ab2235bc (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm037.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index 2df1ec55a97..5024284d645 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c @@ -449,6 +449,7 @@ static int __init pcm037_camera_alloc_dma(const size_t buf_size) static struct platform_device *devices[] __initdata = { &pcm037_flash, &pcm037_sram_device, + &imx_wdt_device0, &pcm037_mt9t031, &pcm037_mt9v022, }; |