diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:52 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:52 +0100 |
| commit | 119c4b1257e44d9ec981465ccb80aba427a96dda (patch) | |
| tree | 059647211002acf6bd0a6137b310d212b5653f7a /arch/arm/mach-mx2/mach-pcm038.c | |
| parent | ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 (diff) | |
| parent | Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable (diff) | |
| download | linux-dev-119c4b1257e44d9ec981465ccb80aba427a96dda.tar.xz linux-dev-119c4b1257e44d9ec981465ccb80aba427a96dda.zip | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-mx2/mach-pcm038.c')
| -rw-r--r-- | arch/arm/mach-mx2/mach-pcm038.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx2/mach-pcm038.c b/arch/arm/mach-mx2/mach-pcm038.c index 035fbe046ec0..36c89431679a 100644 --- a/arch/arm/mach-mx2/mach-pcm038.c +++ b/arch/arm/mach-mx2/mach-pcm038.c @@ -182,6 +182,7 @@ static struct platform_device *platform_devices[] __initdata = { &mxc_w1_master_device, &mxc_fec_device, &pcm038_sram_mtd_device, + &mxc_wdt, }; /* On pcm038 there's a sram attached to CS1, we enable the chipselect here and |