diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 18:08:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 18:08:52 -0400 |
| commit | 119c4b1257e44d9ec981465ccb80aba427a96dda (patch) | |
| tree | 059647211002acf6bd0a6137b310d212b5653f7a /arch/arm/mach-mx3/mach-pcm043.c | |
| parent | 3d34a0d80ab51b6838c08c22e7f47aec408eb837 (diff) | |
| parent | d472d1a1c82ade81d2854db2ff4c9694ed66612e (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm043.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm043.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c index 1bf1ec2eef5e..78d9185a9d4b 100644 --- a/arch/arm/mach-mx3/mach-pcm043.c +++ b/arch/arm/mach-mx3/mach-pcm043.c | |||
| @@ -150,6 +150,7 @@ static struct i2c_board_info pcm043_i2c_devices[] = { | |||
| 150 | static struct platform_device *devices[] __initdata = { | 150 | static struct platform_device *devices[] __initdata = { |
| 151 | &pcm043_flash, | 151 | &pcm043_flash, |
| 152 | &mxc_fec_device, | 152 | &mxc_fec_device, |
| 153 | &imx_wdt_device0, | ||
| 153 | }; | 154 | }; |
| 154 | 155 | ||
| 155 | static struct pad_desc pcm043_pads[] = { | 156 | static struct pad_desc pcm043_pads[] = { |