From d777ba2e69bd2b7304adfabad6d1e495bd1b4f99 Mon Sep 17 00:00:00 2001 From: Erik Arfvidson Date: Tue, 5 May 2015 18:36:11 -0400 Subject: [PATCH] staging: unisys: remove visorchipset_umode.h removes visorchipset_umode.h and pass functionality to visorchipset.h Signed-off-by: Erik Arfvidson Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/visorchipset/file.c | 1 - .../unisys/visorchipset/visorchipset.h | 1 + .../unisys/visorchipset/visorchipset_umode.h | 35 ------------------- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 drivers/staging/unisys/visorchipset/visorchipset_umode.h diff --git a/drivers/staging/unisys/visorchipset/file.c b/drivers/staging/unisys/visorchipset/file.c index 9822e9d1d6be..153f736dd76c 100644 --- a/drivers/staging/unisys/visorchipset/file.c +++ b/drivers/staging/unisys/visorchipset/file.c @@ -23,7 +23,6 @@ #include #include "version.h" #include "visorchipset.h" -#include "visorchipset_umode.h" #include "visorbus.h" #include "uisutils.h" #include "file.h" diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h index 1d66c3766c42..dcf8a2345a59 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset.h +++ b/drivers/staging/unisys/visorchipset/visorchipset.h @@ -28,6 +28,7 @@ #include "vbushelper.h" #define MYDRVNAME "visorchipset" +#define VISORCHIPSET_MMAP_CONTROLCHANOFFSET 0x00000000 /** Describes the state from the perspective of which controlvm messages have * been received for a bus or device. diff --git a/drivers/staging/unisys/visorchipset/visorchipset_umode.h b/drivers/staging/unisys/visorchipset/visorchipset_umode.h deleted file mode 100644 index 8af5bf33883c..000000000000 --- a/drivers/staging/unisys/visorchipset/visorchipset_umode.h +++ /dev/null @@ -1,35 +0,0 @@ -/* visorchipset_umode.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. - */ - -/** @file ********************************************************************* - * - * This describes structures needed for the interface between the - * visorchipset driver and a user-mode component that opens the device. - * - ****************************************************************************** - */ - -#ifndef __VISORCHIPSET_UMODE_H -#define __VISORCHIPSET_UMODE_H - -/** The user-mode program can access the control channel buffer directly - * via this memory map. - */ -#define VISORCHIPSET_MMAP_CONTROLCHANOFFSET 0x00000000 -#define VISORCHIPSET_MMAP_CONTROLCHANSIZE 0x00400000 /* 4MB */ - -#endif /* __VISORCHIPSET_UMODE_H */ -- 2.20.1