Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[mv-sheeva.git] / include / asm-ppc / mv64x60.h

diff --git a/include/asm-ppc/mv64x60.h b/include/asm-ppc/mv64x60.h
index fa6230fb641a67728d21b2b01e59314bb910f75e..2963d6aa3ea551b6b1d6d0228650dc23d4aca234 100644 (file)
--- a/include/asm-ppc/mv64x60.h
+++ b/include/asm-ppc/mv64x60.h
@@ -120,14 +120,6 @@ extern spinlock_t mv64x60_lock;
 
 #define        MV64x60_64BIT_WIN_COUNT                 24
 
-/* Watchdog Platform Device, Driver Data */
-#define        MV64x60_WDT_NAME                        "mv64x60_wdt"
-
-struct mv64x60_wdt_pdata {
-       int     timeout;        /* watchdog expiry in seconds, default 10 */
-       int     bus_clk;        /* bus clock in MHz, default 133 */
-};
-
 /*
  * Define a structure that's used to pass in config information to the
  * core routines.