Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / include / linux / mv643xx.h

diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
index b021b3a2b65a6f847c846105e6547daa2f8877ff..9c8049005052ccb27343e8197e266e7dd8543157 100644 (file)
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -1302,4 +1302,12 @@ struct mv643xx_eth_platform_data {
        u8              mac_addr[6];    /* mac address if non-zero*/
 };
 
+/* 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 */
+};
+
 #endif /* __ASM_MV643XX_H */