diff options
| author | David Binder <david.binder@unisys.com> | 2017-09-27 13:14:40 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-28 11:20:21 +0200 |
| commit | e8ffed837f6ddc7055d06c69e3ef78b53d39a6f2 (patch) | |
| tree | a4de10a4473743ae78fdb28d3e4a03cd929c8c74 /drivers/staging/unisys | |
| parent | da56cb0487288702e26c3c27eddade5ab59f6ab0 (diff) | |
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>
Diffstat (limited to 'drivers/staging/unisys')
| -rw-r--r-- | drivers/staging/unisys/include/iochannel.h | 2 | ||||
| -rw-r--r-- | drivers/staging/unisys/include/visorbus.h | 2 | ||||
| -rw-r--r-- | drivers/staging/unisys/include/visorchannel.h (renamed from drivers/staging/unisys/include/channel.h) | 6 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorbus/controlvmchannel.h | 2 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorbus/vbuschannel.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h index 69dd9c3391aa..5cd407ca2251 100644 --- 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 6d379e641ed3..8e75c8b61ecc 100644 --- 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 index 6cb8b4d2fd0e..1f4a7b1b68c5 100644 --- 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 4735ed890515..9ee9886a9aed 100644 --- 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 6eae58db41f3..9623911b4b06 100644 --- 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 \ |