Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / drivers / watchdog / ep93xx_wdt.c

diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index cdcdd11173a721309bdc7f6fc722ab25aa8f81a5..e9f950ff86eaee3e685bd35b4eb9c17221da4cde 100644 (file)
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -29,8 +29,7 @@
 #include <linux/watchdog.h>
 #include <linux/timer.h>
 #include <linux/uaccess.h>
-
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #define WDT_VERSION    "0.3"
 #define PFX            "ep93xx_wdt: "
@@ -155,15 +154,15 @@ static long ep93xx_wdt_ioctl(struct file *file,
                ret = put_user(boot_status, (int __user *)arg);
                break;
 
-       case WDIOC_GETTIMEOUT:
-               /* actually, it is 0.250 seconds.... */
-               ret = put_user(1, (int __user *)arg);
-               break;
-
        case WDIOC_KEEPALIVE:
                wdt_keepalive();
                ret = 0;
                break;
+
+       case WDIOC_GETTIMEOUT:
+               /* actually, it is 0.250 seconds.... */
+               ret = put_user(1, (int __user *)arg);
+               break;
        }
        return ret;
 }