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

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
......@@ -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))
......
......@@ -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
......
......@@ -17,7 +17,6 @@
#define __CONTROLVMCHANNEL_H__
#include <linux/uuid.h>
#include "commontypes.h"
#include "channel.h"
#include "controlframework.h"
......
......@@ -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} */
......
......@@ -31,7 +31,6 @@
#include <linux/uuid.h>
#include "commontypes.h"
#include "vmcallinterface.h"
#define _ULTRA_CONTROLVM_CHANNEL_INLINE_
......
......@@ -24,7 +24,6 @@
* the client devices and client drivers for the server end to see.
*/
#include <linux/uuid.h>
#include "commontypes.h"
#include "vbusdeviceinfo.h"
#include "channel.h"
......
......@@ -16,7 +16,7 @@
#ifndef __VBUSDEVICEINFO_H__
#define __VBUSDEVICEINFO_H__
#include "commontypes.h"
#include <linux/types.h>
#pragma pack(push, 1) /* both GCC and VC now allow this pragma */
......
/* Copyright (C) 2010 - 2013 UNISYS CORPORATION
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
* NON INFRINGEMENT. See the GNU General Public License for more
* details.
*/
#ifndef _COMMONTYPES_H_
#define _COMMONTYPES_H_
/* define the following to prevent include nesting in kernel header files of
* similar abbreviated content */
#define _SUPERVISOR_COMMONTYPES_H_
#include <linux/types.h>
#include <linux/version.h>
#include <linux/io.h>
#include <linux/uuid.h>
#endif
......@@ -25,7 +25,8 @@
#include <linux/module.h>
#include <linux/debugfs.h>
#include "commontypes.h"
#include <linux/types.h>
#include <linux/uuid.h>
#include <linux/version.h>
#include "uniklog.h"
......
......@@ -17,7 +17,8 @@
#include <linux/string.h>
#include <linux/slab.h>
#include <commontypes.h>
#include <linux/types.h>
#include <linux/uuid.h>
#include <linux/spinlock.h>
#include <linux/list.h>
#include "uniklog.h"
......
......@@ -24,9 +24,11 @@
#include "uniklog.h"
#include "diagnostics/appos_subsystems.h"
#include "uisutils.h"
#include "commontypes.h"
#include "vbuschannel.h"
#include "vbushelper.h"
#include <linux/types.h>
#include <linux/io.h>
#include <linux/uuid.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/pci.h>
......
......@@ -20,7 +20,6 @@
#include <linux/uuid.h>
#include "commontypes.h"
#include "memregion.h"
#include "channel.h"
#ifndef HOSTADDRESS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment