summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2019-02-22 07:44:57 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2019-02-22 07:44:57 +0300
commit9dd24d4ef3e81683b3c73299f95dce5ef34881d0 (patch)
treef31a8067ba58f3af01c040fd2cf76392136511cb /include/linux
parentcf64e495fe221479866c1ea7c6f5cd9698d8a3af (diff)
parentafb77422819ff60612e9b7d36461b9b2bc8e038e (diff)
downloadlinux-9dd24d4ef3e81683b3c73299f95dce5ef34881d0.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux next
Pull changes from Freescale SoC drivers tree that are required by subsequent caam/qi2 patches.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fsl/mc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h
index 741f567253ef..975553a9f75d 100644
--- a/include/linux/fsl/mc.h
+++ b/include/linux/fsl/mc.h
@@ -193,6 +193,7 @@ struct fsl_mc_device {
struct resource *regions;
struct fsl_mc_device_irq **irqs;
struct fsl_mc_resource *resource;
+ struct device_link *consumer_link;
};
#define to_fsl_mc_device(_dev) \