]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
arm/mach-mx2: add watchdog device to Phytec-boards
authorWolfram Sang <w.sang@pengutronix.de>
Thu, 29 Apr 2010 08:03:20 +0000 (10:03 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 17 May 2010 09:47:03 +0000 (11:47 +0200)
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-mx2/mach-pca100.c
arch/arm/mach-mx2/mach-pcm038.c

index 778fff230918c93977b702944c4132067c27cd6e..a87422ed4ff5a1ea9bd4f07605092bc646842ca9 100644 (file)
@@ -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 = {
index 035fbe046ec0d01610621fd9663056481f8dc579..36c89431679a93edd5e66118ce9eb9b5838b9045 100644 (file)
@@ -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