Commit e8ffed83 authored by David Binder's avatar David Binder Committed by Greg Kroah-Hartman
Browse files

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: default avatarDavid Binder <david.binder@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarTim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da56cb04

drivers/staging/unisys/include/iochannel.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/unisys/include/visorbus.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


#include <linux/device.h>



#include "channel.h"

#include "visorchannel.h"



struct visorchipset_state {

	u32 created:1;

drivers/staging/unisys/include/channel.h→drivers/staging/unisys/include/visorchannel.h

+3 −3
Original line number Diff line number Diff line
@@ -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, \

drivers/staging/unisys/visorbus/controlvmchannel.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include <linux/uuid.h>



#include "channel.h"

#include "visorchannel.h"



/* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */

#define VISOR_CONTROLVM_CHANNEL_GUID \

drivers/staging/unisys/visorbus/vbuschannel.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 */



#include <linux/uuid.h>

#include "channel.h"

#include "visorchannel.h"



/* {193b331b-c58f-11da-95a9-00e08161165f} */

#define VISOR_VBUS_CHANNEL_GUID						\

CRA Git | Maintained and supported by SUSTech CRA and CCSE