diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-26 14:49:15 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-26 14:49:15 +0300 |
commit | 63307cb1230f739c23d6b5c6a2127be4b6cd4574 (patch) | |
tree | 325f4ddb586fc37495f730cde21c7e70d93780ae | |
parent | dd36a2d9adfb03fb0ae08abe6372bcf05df38728 (diff) | |
download | linux-63307cb1230f739c23d6b5c6a2127be4b6cd4574.tar.xz |
Revert "staging: fsl-mc: make dprc.h header private"
This reverts commit 1877e4ba2d0890244284eea101681b6f990aa2be.
The whole series is broken, so back it all out.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/fsl-mc/bus/dprc.c | 2 | ||||
-rw-r--r-- | drivers/staging/fsl-mc/bus/fsl-mc-private.h | 1 | ||||
-rw-r--r-- | drivers/staging/fsl-mc/include/dprc.h (renamed from drivers/staging/fsl-mc/bus/dprc.h) | 0 | ||||
-rw-r--r-- | drivers/staging/fsl-mc/include/mc.h | 1 |
4 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/fsl-mc/bus/dprc.c b/drivers/staging/fsl-mc/bus/dprc.c index 6f6c65a42166..138fe80577d8 100644 --- a/drivers/staging/fsl-mc/bus/dprc.c +++ b/drivers/staging/fsl-mc/bus/dprc.c @@ -31,7 +31,7 @@ */ #include <linux/kernel.h> #include "../include/mc.h" -#include "dprc.h" +#include "../include/dprc.h" #include "dprc-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/staging/fsl-mc/bus/fsl-mc-private.h index 62d398947605..e5839992e128 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-private.h +++ b/drivers/staging/fsl-mc/bus/fsl-mc-private.h @@ -11,7 +11,6 @@ #define _FSL_MC_PRIVATE_H_ #include "../include/mc.h" -#include "dprc.h" #include <linux/mutex.h> /** diff --git a/drivers/staging/fsl-mc/bus/dprc.h b/drivers/staging/fsl-mc/include/dprc.h index 21295e4feb04..21295e4feb04 100644 --- a/drivers/staging/fsl-mc/bus/dprc.h +++ b/drivers/staging/fsl-mc/include/dprc.h diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h index aafe63a21f49..38f87144324a 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/drivers/staging/fsl-mc/include/mc.h @@ -14,6 +14,7 @@ #include <linux/device.h> #include <linux/mod_devicetable.h> #include <linux/interrupt.h> +#include "../include/dprc.h" #define FSL_MC_VENDOR_FREESCALE 0x1957 |