summaryrefslogtreecommitdiff
path: root/drivers/hwtracing/intel_th/intel_th.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-15 08:19:11 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-15 08:19:11 +0300
commit80f76319634fc62befd440b328042dbd54e3b6f8 (patch)
treee786c2ca89641d38ca5ea90a7a44b2edf57ade14 /drivers/hwtracing/intel_th/intel_th.h
parent241903641111803807c90016866d88d7ef8c9347 (diff)
parent7a1a47ce35821b40f5b2ce46379ba14393bc3873 (diff)
downloadlinux-80f76319634fc62befd440b328042dbd54e3b6f8.tar.xz
Merge tag 'stm-for-greg-20160714' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next
Alexander writes: intel_th: Fixes -t://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git tags/stm-for-greg-20160714 stable These are: * a fix for a modprobe time deadlock * a new PCI ID for Kaby Lake PCH-H
Diffstat (limited to 'drivers/hwtracing/intel_th/intel_th.h')
-rw-r--r--drivers/hwtracing/intel_th/intel_th.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hwtracing/intel_th/intel_th.h b/drivers/hwtracing/intel_th/intel_th.h
index 20f57aa4d8f5..4c195786bf1f 100644
--- a/drivers/hwtracing/intel_th/intel_th.h
+++ b/drivers/hwtracing/intel_th/intel_th.h
@@ -208,6 +208,9 @@ struct intel_th {
int id;
int major;
+#ifdef CONFIG_MODULES
+ struct work_struct request_module_work;
+#endif /* CONFIG_MODULES */
#ifdef CONFIG_INTEL_TH_DEBUG
struct dentry *dbg;
#endif