amazon: Upgrade amazon target to kernel 2.6.37

[openwrt/svn-archive/archive.git] / target / linux / amazon / files / drivers / watchdog / amazon_wdt.c

diff --git a/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c b/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c
index fcf1649d8512a840f3f44ceedbbba327216121b9..89f1e2281c2d4d1f4ab8cdbebbbf49b897284b68 100644 (file)
--- a/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c
+++ b/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c
@@ -17,6 +17,7 @@
  * Copyright (C) 2007 John Crispin <blogic@openwrt.org>
  */
 
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>
@@ -118,7 +119,11 @@ void wdt_disable(void)
        return;
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
+static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+#else
 static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+#endif
 {
        int result=0;
        static int timeout=-1;
@@ -201,7 +206,11 @@ int wdt_register_proc_read(char *buf, char **start, off_t offset,
 static struct file_operations wdt_fops = {
        read:           wdt_read,
        write:          wdt_write,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
+       unlocked_ioctl: wdt_ioctl,
+#else
        ioctl:          wdt_ioctl,
+#endif
        open:           wdt_open,
        release:        wdt_release,    
 };