staging: unisys: include: Rename channel.h to visorchannel.h

In order to avoid a potential conflict with other drivers that define a
channel.h file, the s-Par channel.h file is renamed in accordance with the
surrounding driver-set namespace.

Signed-off-by: David Binder <david.binder@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <timothy.sell@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 69dd9c3391aa1b03d683facbe7ac7e0a74d51be0..5cd407ca2251190ebc84e7a4751e8d91047d729d 100644 (file)
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -44,7 +44,7 @@
 #include <linux/uuid.h>
 #include <linux/skbuff.h>
 
-#include "channel.h"
+#include "visorchannel.h"
 
 /*
  * Must increment these whenever you insert or delete fields within this channel

diff --git a/drivers/staging/unisys/include/visorbus.h b/drivers/staging/unisys/include/visorbus.h
index 6d379e641ed3e770bd7270c197c769e64271a203..8e75c8b61ecc9d17d68c569e30e51b40afcd013c 100644 (file)
--- a/drivers/staging/unisys/include/visorbus.h
+++ b/drivers/staging/unisys/include/visorbus.h
@@ -29,7 +29,7 @@
 
 #include <linux/device.h>
 
-#include "channel.h"
+#include "visorchannel.h"
 
 struct visorchipset_state {
        u32 created:1;

diff --git a/drivers/staging/unisys/include/channel.h b/drivers/staging/unisys/include/visorchannel.h
similarity index 98%
rename from drivers/staging/unisys/include/channel.h
rename to drivers/staging/unisys/include/visorchannel.h
index 6cb8b4d2fd0ebdeefefaf380f354ec5d43cb1b9c..1f4a7b1b68c54c1dddf7391d3d19f2d4c59ed6a8 100644 (file)
--- a/drivers/staging/unisys/include/channel.h
+++ b/drivers/staging/unisys/include/visorchannel.h
@@ -14,8 +14,8 @@
  * details.
  */
 
-#ifndef __CHANNEL_H__
-#define __CHANNEL_H__
+#ifndef __VISORCHANNEL_H__
+#define __VISORCHANNEL_H__
 
 #include <linux/types.h>
 #include <linux/uuid.h>
@@ -181,7 +181,7 @@ struct signal_queue_header {
        u8 filler[12];
 } __packed;
 
-/* CHANNEL Guids */
+/* VISORCHANNEL Guids */
 /* {414815ed-c58c-11da-95a9-00e08161165f} */
 #define VISOR_VHBA_CHANNEL_GUID \
        GUID_INIT(0x414815ed, 0xc58c, 0x11da, \

diff --git a/drivers/staging/unisys/visorbus/controlvmchannel.h b/drivers/staging/unisys/visorbus/controlvmchannel.h
index 4735ed890515838670d02f87516b19d638c8078d..9ee9886a9aedb8c63ad151812858ef9099883b92 100644 (file)
--- a/drivers/staging/unisys/visorbus/controlvmchannel.h
+++ b/drivers/staging/unisys/visorbus/controlvmchannel.h
@@ -18,7 +18,7 @@
 
 #include <linux/uuid.h>
 
-#include "channel.h"
+#include "visorchannel.h"
 
 /* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */
 #define VISOR_CONTROLVM_CHANNEL_GUID \

diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h b/drivers/staging/unisys/visorbus/vbuschannel.h
index 6eae58db41f3baf2c2e623a5d514ba48d840a7b6..9623911b4b0633e4340fa0f1f215174ba7416e50 100644 (file)
--- a/drivers/staging/unisys/visorbus/vbuschannel.h
+++ b/drivers/staging/unisys/visorbus/vbuschannel.h
@@ -26,7 +26,7 @@
  */
 
 #include <linux/uuid.h>
-#include "channel.h"
+#include "visorchannel.h"
 
 /* {193b331b-c58f-11da-95a9-00e08161165f} */
 #define VISOR_VBUS_CHANNEL_GUID                                                \