From: Prarit Bhargava Date: Tue, 5 May 2015 22:36:09 +0000 (-0400) Subject: staging: unisys: remove globals.h X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=40699b97e2b55aa31cf486731c13ec287ad2b0d0;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- 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