From 1a58fc3f3adf2ed86ecc30597ee25663558081a8 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Thu, 29 Apr 2010 10:03:20 +0200 Subject: [PATCH] --- yaml --- r: 198469 b: refs/heads/master c: f13899da00e1b815211cf246c7d2704db3c18e37 h: refs/heads/master i: 198467: 6b6b67faaac931aad2e7a386811c54dec33f7b27 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx2/mach-pca100.c | 1 + trunk/arch/arm/mach-mx2/mach-pcm038.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index af0ff3dda324..9cba96f36ebd 100644 --- 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 index 778fff230918..a87422ed4ff5 100644 --- 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 index 035fbe046ec0..36c89431679a 100644 --- 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