---

yaml --- r: 198469 b: refs/heads/master c: f13899d h: refs/heads/master i: 198467: 6b6b67f v: v3
git-mirror · May 17, 2010 · 1a58fc3 · 1a58fc3
1 parent 6a36195
commit 1a58fc3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3170ba546f8d4d2c35809f311c67311f896199f5
+refs/heads/master: f13899da00e1b815211cf246c7d2704db3c18e37
diff --git a/trunk/arch/arm/mach-mx2/mach-pca100.c b/trunk/arch/arm/mach-mx2/mach-pca100.c
@@ -145,6 +145,7 @@ static struct mxc_nand_platform_data pca100_nand_board_info = {
 static struct platform_device *platform_devices[] __initdata = {
 	&mxc_w1_master_device,
 	&mxc_fec_device,
+	&mxc_wdt,
 };
 
 static struct imxi2c_platform_data pca100_i2c_1_data = {

diff --git a/trunk/arch/arm/mach-mx2/mach-pcm038.c b/trunk/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