Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d2def98 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: remove commontypes.h 



Delete commontypes.h, and replace all of the places that #included it with
correct #includes for the types used in that file.

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15fe5f2c

drivers/staging/unisys/common-spar/include/channels/channel.h

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#ifndef __CHANNEL_H__

#define __CHANNEL_H__



#include <linux/types.h>

#include <linux/io.h>

#include <linux/uuid.h>



/*
@@ -30,8 +32,6 @@ 
 */

#define __SUPERVISOR_CHANNEL_H__



#include "commontypes.h"



#define SIGNATURE_16(A, B) ((A) | (B<<8))

#define SIGNATURE_32(A, B, C, D) \

	(SIGNATURE_16(A, B) | (SIGNATURE_16(C, D) << 16))

drivers/staging/unisys/common-spar/include/channels/controlframework.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#ifndef _CONTROL_FRAMEWORK_H_

#define _CONTROL_FRAMEWORK_H_



#include "commontypes.h"

#include <linux/types.h>

#include "channel.h"



#define ULTRA_MEMORY_COUNT_Ki 1024

drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#define __CONTROLVMCHANNEL_H__



#include <linux/uuid.h>

#include "commontypes.h"

#include "channel.h"

#include "controlframework.h"

drivers/staging/unisys/common-spar/include/channels/diagchannel.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#ifndef _DIAG_CHANNEL_H_

#define _DIAG_CHANNEL_H_



#include "commontypes.h"

#include <linux/uuid.h>

#include "channel.h"



/* {EEA7A573-DB82-447c-8716-EFBEAAAE4858} */

drivers/staging/unisys/common-spar/include/channels/iochannel.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 


#include <linux/uuid.h>



#include "commontypes.h"

#include "vmcallinterface.h"



#define _ULTRA_CONTROLVM_CHANNEL_INLINE_