Merge commit 'upstream/master'

[linux-2.6] / drivers / watchdog / mpc5200_wdt.c

diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c
index 80a91d4cea11fff2f2a1cb05c523863f04dfbba2..77c1c2ae2cc2499f91928c6b3d69ddf34663f71b 100644 (file)
--- a/drivers/watchdog/mpc5200_wdt.c
+++ b/drivers/watchdog/mpc5200_wdt.c
@@ -4,7 +4,7 @@
 #include <linux/watchdog.h>
 #include <linux/io.h>
 #include <linux/spinlock.h>
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
 #include <asm/uaccess.h>
 #include <asm/mpc52xx.h>