Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2...

diff --combined drivers/char/watchdog/at91rm9200_wdt.c
index cb86967e2c5f51ede04fd92b8cc553cb9475cbe8,c8da2b0a1cd86d74d9b7c989bd3111bf7845fcc3..38bd3737259973fcaebf683a2a5810283e46ffd8
--- 1/drivers/char/watchdog/at91rm9200_wdt.c
--- 2/drivers/char/watchdog/at91rm9200_wdt.c
+++ b/drivers/char/watchdog/at91rm9200_wdt.c
@@@ -21,7 -21,6 +21,7 @@@
  #include <linux/watchdog.h>
  #include <asm/bitops.h>
  #include <asm/uaccess.h>
 +#include <asm/arch/at91_st.h>
  
  
  #define WDT_DEFAULT_TIME      5       /* seconds */
@@@ -203,9 -202,9 +203,9 @@@ static int __init at91wdt_probe(struct 
  {
        int res;
  
-       if (at91wdt_miscdev.dev)
+       if (at91wdt_miscdev.parent)
                return -EBUSY;
-       at91wdt_miscdev.dev = &pdev->dev;
+       at91wdt_miscdev.parent = &pdev->dev;
  
        res = misc_register(&at91wdt_miscdev);
        if (res)
@@@ -221,7 -220,7 +221,7 @@@ static int __exit at91wdt_remove(struc
  
        res = misc_deregister(&at91wdt_miscdev);
        if (!res)
-               at91wdt_miscdev.dev = NULL;
+               at91wdt_miscdev.parent = NULL;
  
        return res;
  }