aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrarit Bhargava <prarit@redhat.com>2015-05-05 18:36:09 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-08 15:25:59 +0200
commit40699b97e2b55aa31cf486731c13ec287ad2b0d0 (patch)
tree02047e24b1f83273c122f24edfc387d9c716f0eb
parentstaging: unisys: rename visorchannel_funcs.c to visorchannel.c (diff)
staging: unisys: remove globals.h
globals.h is only included in visorchannel.c and only contains 2 includes. These can be included directly in visorchannel.c. Signed-off-by: Prarit Bhargava <prarit@redhat.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/unisys/visorbus/globals.h27
-rw-r--r--drivers/staging/unisys/visorbus/visorchannel.c3
2 files changed, 2 insertions, 28 deletions
diff --git a/drivers/staging/unisys/visorbus/globals.h b/drivers/staging/unisys/visorbus/globals.h
deleted file mode 100644
index 0ed8e1d8033a..000000000000
--- a/drivers/staging/unisys/visorbus/globals.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* globals.h
- *
- * 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 __VISORCHANNEL_GLOBALS_H__
-#define __VISORCHANNEL_GLOBALS_H__
-
-#include "timskmod.h"
-#include "memregion.h"
-#include "version.h"
-
-#define MYDRVNAME "visorchannel"
-
-#endif
diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c
index b61f9549d352..33a4360cf8e6 100644
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -22,7 +22,8 @@
* a CM2 implementation and a direct memory implementation.)
*/
-#include "globals.h"
+#include "memregion.h"
+#include "version.h"
#include "visorbus.h"
#include <linux/uuid.h>