diff --git a/[refs] b/[refs] index 005cc231bffb..92021814a680 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ad64ba8ea55319ddc3c7534e77a4abee5d6fa43 +refs/heads/master: 214b99fd418527447eade85df581a97d12fc31f8 diff --git a/trunk/drivers/staging/mei/wd.c b/trunk/drivers/staging/mei/wd.c index fd679524f383..b56b1cc1e8dc 100644 --- a/trunk/drivers/staging/mei/wd.c +++ b/trunk/drivers/staging/mei/wd.c @@ -26,16 +26,6 @@ #include "interface.h" #include "mei.h" -/* - * MEI Watchdog Module Parameters - */ -static u16 watchdog_timeout = AMT_WD_DEFAULT_TIMEOUT; -module_param(watchdog_timeout, ushort, 0); -MODULE_PARM_DESC(watchdog_timeout, - "Intel(R) AMT Watchdog timeout value in seconds. (default=" - __MODULE_STRING(AMT_WD_DEFAULT_TIMEOUT) - ", disable=0)"); - static const u8 mei_start_wd_params[] = { 0x02, 0x12, 0x13, 0x10 }; static const u8 mei_stop_wd_params[] = { 0x02, 0x02, 0x14, 0x10 };