From 291603cca7eb52e7c2be4c5e1451de431bd21e73 Mon Sep 17 00:00:00 2001 From: Don Zickus Date: Tue, 5 May 2015 18:36:01 -0400 Subject: [PATCH] staging: unisys: Move visorchannel into visorbus visorchannel seems to be a necessary component to visorbus and can never function as a standalone module. Let's treat it like a visorbus feature that is always enabled. Signed-off-by: Don Zickus Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/Kconfig | 1 - drivers/staging/unisys/Makefile | 1 - drivers/staging/unisys/visorbus/Kconfig | 3 +-- drivers/staging/unisys/visorbus/Makefile | 2 +- drivers/staging/unisys/visorbus/globals.h | 27 +++++++++++++++++++ .../{visorchannel => visorbus}/visorchannel.h | 0 .../visorchannel_funcs.c | 0 drivers/staging/unisys/visorchipset/Kconfig | 1 + drivers/staging/unisys/visorchipset/Makefile | 2 +- 9 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 drivers/staging/unisys/visorbus/globals.h rename drivers/staging/unisys/{visorchannel => visorbus}/visorchannel.h (100%) rename drivers/staging/unisys/{visorchannel => visorbus}/visorchannel_funcs.c (100%) diff --git a/drivers/staging/unisys/Kconfig b/drivers/staging/unisys/Kconfig index 8d056b55ced7..dbdd4492cf0f 100644 --- a/drivers/staging/unisys/Kconfig +++ b/drivers/staging/unisys/Kconfig @@ -10,7 +10,6 @@ menuconfig UNISYSSPAR if UNISYSSPAR source "drivers/staging/unisys/visorutil/Kconfig" -source "drivers/staging/unisys/visorchannel/Kconfig" source "drivers/staging/unisys/visorchipset/Kconfig" source "drivers/staging/unisys/visorbus/Kconfig" diff --git a/drivers/staging/unisys/Makefile b/drivers/staging/unisys/Makefile index 1ed9d39ff230..b14a4777fd48 100644 --- a/drivers/staging/unisys/Makefile +++ b/drivers/staging/unisys/Makefile @@ -2,6 +2,5 @@ # Makefile for Unisys SPAR drivers # obj-$(CONFIG_UNISYS_VISORUTIL) += visorutil/ -obj-$(CONFIG_UNISYS_VISORCHANNEL) += visorchannel/ obj-$(CONFIG_UNISYS_VISORCHIPSET) += visorchipset/ obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/ diff --git a/drivers/staging/unisys/visorbus/Kconfig b/drivers/staging/unisys/visorbus/Kconfig index 0141528657e2..12cf8f063550 100644 --- a/drivers/staging/unisys/visorbus/Kconfig +++ b/drivers/staging/unisys/visorbus/Kconfig @@ -4,7 +4,6 @@ config UNISYS_VISORBUS tristate "Unisys visorbus driver" - depends on UNISYSSPAR && UNISYS_VISORUTIL && UNISYS_VISORCHANNEL && UNISYS_VISORCHIPSET + depends on UNISYSSPAR && UNISYS_VISORUTIL && UNISYS_VISORCHIPSET ---help--- If you say Y here, you will enable the Unisys visorbus driver. - diff --git a/drivers/staging/unisys/visorbus/Makefile b/drivers/staging/unisys/visorbus/Makefile index 60bb96bad239..20d87daf5b00 100644 --- a/drivers/staging/unisys/visorbus/Makefile +++ b/drivers/staging/unisys/visorbus/Makefile @@ -5,9 +5,9 @@ obj-$(CONFIG_UNISYS_VISORBUS) += visorbus.o visorbus-y := visorbus_main.o devmajorminor_attr.o businst_attr.o channel_attr.o +visorbus-y += visorchannel_funcs.o ccflags-y += -Idrivers/staging/unisys/include -ccflags-y += -Idrivers/staging/unisys/visorchannel ccflags-y += -Idrivers/staging/unisys/visorchipset ccflags-y += -Idrivers/staging/unisys/common-spar/include ccflags-y += -Idrivers/staging/unisys/common-spar/include/channels diff --git a/drivers/staging/unisys/visorbus/globals.h b/drivers/staging/unisys/visorbus/globals.h new file mode 100644 index 000000000000..0ed8e1d8033a --- /dev/null +++ b/drivers/staging/unisys/visorbus/globals.h @@ -0,0 +1,27 @@ +/* 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/visorchannel/visorchannel.h b/drivers/staging/unisys/visorbus/visorchannel.h similarity index 100% rename from drivers/staging/unisys/visorchannel/visorchannel.h rename to drivers/staging/unisys/visorbus/visorchannel.h diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorbus/visorchannel_funcs.c similarity index 100% rename from drivers/staging/unisys/visorchannel/visorchannel_funcs.c rename to drivers/staging/unisys/visorbus/visorchannel_funcs.c diff --git a/drivers/staging/unisys/visorchipset/Kconfig b/drivers/staging/unisys/visorchipset/Kconfig index b03bfc5c3043..2030592d2023 100644 --- a/drivers/staging/unisys/visorchipset/Kconfig +++ b/drivers/staging/unisys/visorchipset/Kconfig @@ -6,6 +6,7 @@ config UNISYS_VISORCHIPSET tristate "Unisys visorchipset driver" select UNISYS_VISORUTIL select UNISYS_VISORCHANNEL + select UNISYS_VISORBUS ---help--- If you say Y here, you will enable the Unisys visorchipset driver. diff --git a/drivers/staging/unisys/visorchipset/Makefile b/drivers/staging/unisys/visorchipset/Makefile index 12686906bef3..1bf6699579ec 100644 --- a/drivers/staging/unisys/visorchipset/Makefile +++ b/drivers/staging/unisys/visorchipset/Makefile @@ -8,8 +8,8 @@ visorchipset-y := visorchipset_main.o file.o parser.o ccflags-y += -Idrivers/staging/unisys/include ccflags-y += -Idrivers/staging/unisys/uislib -ccflags-y += -Idrivers/staging/unisys/visorchannel ccflags-y += -Idrivers/staging/unisys/common-spar/include ccflags-y += -Idrivers/staging/unisys/common-spar/include/channels ccflags-y += -Idrivers/staging/unisys/visorutil +ccflags-y += -Idrivers/staging/unisys/visorbus ccflags-y += -Iinclude/generated -- 2.34.1