From 824ebf182db01e705550bf4f031fabfc969a74bc Mon Sep 17 00:00:00 2001
From: Stuart Yoder <stuart.yoder@nxp.com>
Date: Mon, 17 Oct 2016 13:42:18 -0500
Subject: [PATCH] staging: fsl-mc: cleanup: move dpbp and dpcon cmd headers

The dpbp and dpcon cmd header files should not be in the public
include directory but should be private to the bus driver.

Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/fsl-mc/{include => bus}/dpbp-cmd.h  | 0
 drivers/staging/fsl-mc/bus/dpbp.c                   | 3 ++-
 drivers/staging/fsl-mc/{include => bus}/dpcon-cmd.h | 0
 drivers/staging/fsl-mc/bus/fsl-mc-allocator.c       | 4 ++--
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename drivers/staging/fsl-mc/{include => bus}/dpbp-cmd.h (100%)
 rename drivers/staging/fsl-mc/{include => bus}/dpcon-cmd.h (100%)

diff --git a/drivers/staging/fsl-mc/include/dpbp-cmd.h b/drivers/staging/fsl-mc/bus/dpbp-cmd.h
similarity index 100%
rename from drivers/staging/fsl-mc/include/dpbp-cmd.h
rename to drivers/staging/fsl-mc/bus/dpbp-cmd.h
diff --git a/drivers/staging/fsl-mc/bus/dpbp.c b/drivers/staging/fsl-mc/bus/dpbp.c
index 5d4cd812a400..b392745a4f83 100644
--- a/drivers/staging/fsl-mc/bus/dpbp.c
+++ b/drivers/staging/fsl-mc/bus/dpbp.c
@@ -32,7 +32,8 @@
 #include "../include/mc-sys.h"
 #include "../include/mc-cmd.h"
 #include "../include/dpbp.h"
-#include "../include/dpbp-cmd.h"
+
+#include "dpbp-cmd.h"
 
 /**
  * dpbp_open() - Open a control session for the specified object.
diff --git a/drivers/staging/fsl-mc/include/dpcon-cmd.h b/drivers/staging/fsl-mc/bus/dpcon-cmd.h
similarity index 100%
rename from drivers/staging/fsl-mc/include/dpcon-cmd.h
rename to drivers/staging/fsl-mc/bus/dpcon-cmd.h
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
index e93ab53bae67..cf1014822906 100644
--- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
+++ b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
@@ -12,9 +12,9 @@
 #include <linux/msi.h>
 #include "../include/mc-bus.h"
 #include "../include/mc-sys.h"
-#include "../include/dpbp-cmd.h"
-#include "../include/dpcon-cmd.h"
 
+#include "dpbp-cmd.h"
+#include "dpcon-cmd.h"
 #include "fsl-mc-private.h"
 
 #define FSL_MC_IS_ALLOCATABLE(_obj_type) \
-- 
2.20.1