From: David Kershner <david.kershner@unisys.com>
Date: Sat, 13 Jun 2015 03:12:35 +0000 (-0400)
Subject: staging: unisys: cleanup iochannel includes
X-Git-Tag: firefly_0821_release~176^2~1545^2~153
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2c13087194700b16aada1a9112fad5b3861ac9fb;p=firefly-linux-kernel-4.4.55.git

staging: unisys: cleanup iochannel includes

The iochannel.h file no longer needs to include
conttrolvmchannel.h, vbuschannel.h and vmcallinterfaces.h.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h
index 538036d378fb..64a581a4b4e4 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -30,13 +30,7 @@
 
 #include <linux/uuid.h>
 
-#include "vmcallinterface.h"
-
-#define _ULTRA_CONTROLVM_CHANNEL_INLINE_
 #include <linux/dma-direction.h>
-#include "controlvmchannel.h"
-#include "vbuschannel.h"
-#undef _ULTRA_CONTROLVM_CHANNEL_INLINE_
 #include "channel.h"
 #include "channel_guid.h"