aboutsummaryrefslogtreecommitdiff
path: root/drivers/xen/xen-pciback/pciback.h
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-03-18 12:02:43 +0800
committerAlex Shi <alex.shi@linaro.org>2016-03-18 12:02:43 +0800
commit241bca50dd1ae71a7cd7eebe579bd131bf986167 (patch)
treef9d4af30aefba27b3c00074d935f8b5b01d54939 /drivers/xen/xen-pciback/pciback.h
parent1ebca975cbc0ab4708126e26bf2729777184f1e6 (diff)
parent5cc3b58828a8bb2ebb34de96d1aec1564f912a31 (diff)
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.03-android
Diffstat (limited to 'drivers/xen/xen-pciback/pciback.h')
-rw-r--r--drivers/xen/xen-pciback/pciback.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/xen-pciback/pciback.h b/drivers/xen/xen-pciback/pciback.h
index 58e38d586f52..4d529f3e40df 100644
--- a/drivers/xen/xen-pciback/pciback.h
+++ b/drivers/xen/xen-pciback/pciback.h
@@ -37,6 +37,7 @@ struct xen_pcibk_device {
struct xen_pci_sharedinfo *sh_info;
unsigned long flags;
struct work_struct op_work;
+ struct xen_pci_op op;
};
struct xen_pcibk_dev_data {