From 63307cb1230f739c23d6b5c6a2127be4b6cd4574 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 26 Jun 2017 13:49:15 +0200 Subject: [PATCH] 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 Cc: Laurentiu Tudor Signed-off-by: Greg Kroah-Hartman --- drivers/staging/fsl-mc/bus/dprc.c | 2 +- drivers/staging/fsl-mc/bus/fsl-mc-private.h | 1 - drivers/staging/fsl-mc/{bus => include}/dprc.h | 0 drivers/staging/fsl-mc/include/mc.h | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) rename drivers/staging/fsl-mc/{bus => include}/dprc.h (100%) 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 #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 /** diff --git a/drivers/staging/fsl-mc/bus/dprc.h b/drivers/staging/fsl-mc/include/dprc.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dprc.h rename to 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 #include #include +#include "../include/dprc.h" #define FSL_MC_VENDOR_FREESCALE 0x1957 -- 2.11.0