Merge branch 'master' of /home/cbou/linux-2.6

[linux-2.6] / drivers / net / wireless / b43 / b43.h

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 532365f5ecefeb3f858bf9d0412650ac1769dd1f..edcdfa366452b7ce34b4acb6e622c3402c7fdb23 100644 (file)
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -441,6 +441,8 @@ enum {
 #define B43_FWPANIC_DIE                        0 /* Firmware died. Don't auto-restart it. */
 #define B43_FWPANIC_RESTART            1 /* Firmware died. Schedule a controller reset. */
 
+/* The firmware register that contains the watchdog counter. */
+#define B43_WATCHDOG_REG               1
 
 /* Device specific rate values.
  * The actual values defined here are (rate_in_mbps * 2).