Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

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

diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index ac09fe4d95730adea1a3ad2a76555b147d947584..acf589dc057ce4bfc7fc68037bce4da4ce4c12b0 100644 (file)
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -22,7 +22,6 @@
 #include <linux/module.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
-
 #include <linux/mv643xx.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>