Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/mtd/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().

1 files changed, 21 insertions, 0 deletions

diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 47a86f07831d..333d259b79d5 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -240,6 +240,26 @@ static struct platform_device ts72xx_rtc_device = {
         .num_resources  = 0,
 };
 
+static struct resource ts72xx_wdt_resources[] = {
+        {
+                .start  = TS72XX_WDT_CONTROL_PHYS_BASE,
+                .end    = TS72XX_WDT_CONTROL_PHYS_BASE + SZ_4K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = TS72XX_WDT_FEED_PHYS_BASE,
+                .end    = TS72XX_WDT_FEED_PHYS_BASE + SZ_4K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device ts72xx_wdt_device = {
+        .name           = "ts72xx-wdt",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(ts72xx_wdt_resources),
+        .resource       = ts72xx_wdt_resources,
+};
+
 static struct ep93xx_eth_data ts72xx_eth_data = {
         .phy_id         = 1,
 };
@@ -249,6 +269,7 @@ static void __init ts72xx_init_machine(void)
         ep93xx_init_devices();
         ts72xx_register_flash();
         platform_device_register(&ts72xx_rtc_device);
+        platform_device_register(&ts72xx_wdt_device);
 
         ep93xx_register_eth(&ts72xx_eth_data, 1);
 }