From: Jes Sorensen <[email protected]>
Signed-off-by: Jes Sorensen <[email protected]>
Signed-off-by: Benjamin Romer <[email protected]>
---
drivers/staging/unisys/visorchipset/file.c | 6 +++--
drivers/staging/unisys/visorchipset/file.h | 2 --
drivers/staging/unisys/visorchipset/globals.h | 29 ----------------------
.../unisys/visorchipset/visorchipset_main.c | 2 +-
4 files changed, 5 insertions(+), 34 deletions(-)
delete mode 100644 drivers/staging/unisys/visorchipset/globals.h
diff --git a/drivers/staging/unisys/visorchipset/file.c
b/drivers/staging/unisys/visorchipset/file.c
index 6fc5689..7d8247a 100644
--- a/drivers/staging/unisys/visorchipset/file.c
+++ b/drivers/staging/unisys/visorchipset/file.c
@@ -19,10 +19,12 @@
* communicate with the visorchipset driver using a device/file interface.
*/
-#include "globals.h"
-#include "visorchannel.h"
#include <linux/mm.h>
#include <linux/fs.h>
+#include "version.h"
+#include "visorchipset.h"
+#include "visorchipset_umode.h"
+#include "visorchannel.h"
#include "uisutils.h"
#include "file.h"
diff --git a/drivers/staging/unisys/visorchipset/file.h
b/drivers/staging/unisys/visorchipset/file.h
index 51f7699..6ff28a1 100644
--- a/drivers/staging/unisys/visorchipset/file.h
+++ b/drivers/staging/unisys/visorchipset/file.h
@@ -18,8 +18,6 @@
#ifndef __FILE_H__
#define __FILE_H__
-#include "globals.h"
-
int visorchipset_file_init(dev_t majorDev,
struct visorchannel **pControlVm_channel);
void visorchipset_file_cleanup(dev_t major_dev);
diff --git a/drivers/staging/unisys/visorchipset/globals.h
b/drivers/staging/unisys/visorchipset/globals.h
deleted file mode 100644
index ee7e3b4..0000000
--- a/drivers/staging/unisys/visorchipset/globals.h
+++ /dev/null
@@ -1,29 +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 __VISORCHIPSET_GLOBALS_H__
-#define __VISORCHIPSET_GLOBALS_H__
-
-#include "diagnostics/appos_subsystems.h"
-#include "timskmod.h"
-#include "visorchipset.h"
-#include "visorchipset_umode.h"
-#include "version.h"
-
-/* module parameters */
-
-#endif
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c
b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 7720d2c..767c495 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -15,7 +15,7 @@
* details.
*/
-#include "globals.h"
+#include "version.h"
#include "visorchipset.h"
#include "procobjecttree.h"
#include "visorchannel.h"
--
2.1.4
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
