Merge Linus' latest into master

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

diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index bb79f649dc7ed9ecd70abe2759cfa5a3bac8d21c..bacd867dd22e4c36e56353cff77d2401666eb370 100644 (file)
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -21,8 +21,7 @@
 #include <linux/types.h>
 #include <linux/watchdog.h>
 #include <linux/uaccess.h>
-#include <asm/arch/at91_st.h>
-
+#include <mach/at91_st.h>
 
 #define WDT_DEFAULT_TIME       5       /* seconds */
 #define WDT_MAX_TIME           256     /* seconds */
@@ -137,23 +136,9 @@ static long at91_wdt_ioct(struct file *file,
        int new_value;
 
        switch (cmd) {
-       case WDIOC_KEEPALIVE:
-               at91_wdt_reload();      /* pat the watchdog */
-               return 0;
        case WDIOC_GETSUPPORT:
                return copy_to_user(argp, &at91_wdt_info,
                                sizeof(at91_wdt_info)) ? -EFAULT : 0;
-       case WDIOC_SETTIMEOUT:
-               if (get_user(new_value, p))
-                       return -EFAULT;
-               if (at91_wdt_settimeout(new_value))
-                       return -EINVAL;
-               /* Enable new time value */
-               at91_wdt_start();
-               /* Return current value */
-               return put_user(wdt_time, p);
-       case WDIOC_GETTIMEOUT:
-               return put_user(wdt_time, p);
        case WDIOC_GETSTATUS:
        case WDIOC_GETBOOTSTATUS:
                return put_user(0, p);
@@ -165,6 +150,20 @@ static long at91_wdt_ioct(struct file *file,
                if (new_value & WDIOS_ENABLECARD)
                        at91_wdt_start();
                return 0;
+       case WDIOC_KEEPALIVE:
+               at91_wdt_reload();      /* pat the watchdog */
+               return 0;
+       case WDIOC_SETTIMEOUT:
+               if (get_user(new_value, p))
+                       return -EFAULT;
+               if (at91_wdt_settimeout(new_value))
+                       return -EINVAL;
+               /* Enable new time value */
+               at91_wdt_start();
+               /* Return current value */
+               return put_user(wdt_time, p);
+       case WDIOC_GETTIMEOUT:
+               return put_user(wdt_time, p);
        default:
                return -ENOTTY;
        }