diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2012-06-19 09:13:37 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-20 16:41:38 -0700 |
commit | 21c66d1be7c586b56c2902ada4ba030a12b00063 (patch) | |
tree | cdd393c1330fd325eab58b75355d73f1b8990d8b /drivers/misc | |
parent | 7d5e0e59542ac452585e3a33abcad6e26b4dec4a (diff) | |
download | linux-stable-21c66d1be7c586b56c2902ada4ba030a12b00063.tar.gz linux-stable-21c66d1be7c586b56c2902ada4ba030a12b00063.tar.bz2 linux-stable-21c66d1be7c586b56c2902ada4ba030a12b00063.zip |
mei: group wd_interface_reg with watchdog variables within struct mei_device
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/mei/mei_dev.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index 63d7ee97c5fb..4fe653392a49 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h @@ -237,6 +237,7 @@ struct mei_device { bool mei_host_buffer_is_empty; struct mei_cl wd_cl; + bool wd_interface_reg; bool wd_pending; bool wd_stopped; bool wd_bypass; /* if false, don't refresh watchdog ME client */ @@ -245,7 +246,6 @@ struct mei_device { unsigned char wd_data[MEI_START_WD_DATA_SIZE]; - struct file *iamthif_file_object; struct mei_cl iamthif_cl; struct mei_cl_cb *iamthif_current_cb; @@ -259,8 +259,6 @@ struct mei_device { bool iamthif_flow_control_pending; bool iamthif_ioctl; bool iamthif_canceled; - - bool wd_interface_reg; }; |