diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 21:55:27 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 21:55:27 -0400 |
| commit | 5b0504c0d795d6b0a904ff861c043d7a231f67a4 (patch) | |
| tree | c988e8b614c55d0dae2be4b750a03eb0a4f4d355 /drivers/watchdog/mpc5200_wdt.c | |
| parent | 930074b6b9c4895d20cdadba5aff97907e28728d (diff) | |
| parent | 77a76369475801ab8cbb338b9d8cfa92a491badb (diff) | |
Merge commit 'gcl/gcl-next'
Diffstat (limited to 'drivers/watchdog/mpc5200_wdt.c')
| -rw-r--r-- | drivers/watchdog/mpc5200_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c index 80a91d4cea11..77c1c2ae2cc2 100644 --- a/drivers/watchdog/mpc5200_wdt.c +++ b/drivers/watchdog/mpc5200_wdt.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #include <linux/watchdog.h> | 4 | #include <linux/watchdog.h> |
| 5 | #include <linux/io.h> | 5 | #include <linux/io.h> |
| 6 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
| 7 | #include <asm/of_platform.h> | 7 | #include <linux/of_platform.h> |
| 8 | #include <asm/uaccess.h> | 8 | #include <asm/uaccess.h> |
| 9 | #include <asm/mpc52xx.h> | 9 | #include <asm/mpc52xx.h> |
| 10 | 10 | ||