diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:40:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:40:43 -0500 |
| commit | 3b6f7b9beb553ea71a6d4d76ba82cf32eb6dadd2 (patch) | |
| tree | 2cd8a8d61f350aa3b00e6b0afc998544923f183e /drivers/watchdog/at91sam9_wdt.c | |
| parent | 9be1b56a3e718aa998772019c57c398dbb19e258 (diff) | |
| parent | 07a66d7c53a538e1a9759954a82bb6c07365eff9 (diff) | |
Merge branch 'x86/urgent' into x86/core
Diffstat (limited to 'drivers/watchdog/at91sam9_wdt.c')
| -rw-r--r-- | drivers/watchdog/at91sam9_wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index b1da287f90ec..a56ac84381b1 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/io.h> | ||
| 21 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 22 | #include <linux/miscdevice.h> | 23 | #include <linux/miscdevice.h> |
| 23 | #include <linux/module.h> | 24 | #include <linux/module.h> |