From 53490b545cb07c9d2e1b36aa680afaf0d435aec8 Mon Sep 17 00:00:00 2001 From: Erik Arfvidson Date: Tue, 5 May 2015 18:37:07 -0400 Subject: [PATCH] staging: unisys: move periodic_work.c into the visorbus directory This patch removes visorutil directory, move periodic_work.c into the visorbus directory. Signed-off-by: Erik Arfvidson Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/Kconfig | 1 - drivers/staging/unisys/visorbus/Makefile | 1 + .../unisys/{visorutil => visorbus}/periodic_work.c | 0 drivers/staging/unisys/visorutil/Kconfig | 9 --------- drivers/staging/unisys/visorutil/Makefile | 9 --------- 5 files changed, 1 insertion(+), 19 deletions(-) rename drivers/staging/unisys/{visorutil => visorbus}/periodic_work.c (100%) delete mode 100644 drivers/staging/unisys/visorutil/Kconfig delete mode 100644 drivers/staging/unisys/visorutil/Makefile diff --git a/drivers/staging/unisys/Kconfig b/drivers/staging/unisys/Kconfig index e0562f133613..0c3e9a1368a8 100644 --- a/drivers/staging/unisys/Kconfig +++ b/drivers/staging/unisys/Kconfig @@ -11,7 +11,6 @@ menuconfig UNISYSSPAR if UNISYSSPAR -source "drivers/staging/unisys/visorutil/Kconfig" source "drivers/staging/unisys/visorbus/Kconfig" endif # UNISYSSPAR diff --git a/drivers/staging/unisys/visorbus/Makefile b/drivers/staging/unisys/visorbus/Makefile index 16d3ff507a0a..72d4d4429684 100644 --- a/drivers/staging/unisys/visorbus/Makefile +++ b/drivers/staging/unisys/visorbus/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_UNISYS_VISORBUS) += visorbus.o visorbus-y := visorbus_main.o visorbus-y += visorchannel.o visorbus-y += visorchipset.o +visorbus-y += periodic_work.o ccflags-y += -Idrivers/staging/unisys/include ccflags-y += -Idrivers/staging/unisys/common-spar/include diff --git a/drivers/staging/unisys/visorutil/periodic_work.c b/drivers/staging/unisys/visorbus/periodic_work.c similarity index 100% rename from drivers/staging/unisys/visorutil/periodic_work.c rename to drivers/staging/unisys/visorbus/periodic_work.c diff --git a/drivers/staging/unisys/visorutil/Kconfig b/drivers/staging/unisys/visorutil/Kconfig deleted file mode 100644 index be9c2cf890cc..000000000000 --- a/drivers/staging/unisys/visorutil/Kconfig +++ /dev/null @@ -1,9 +0,0 @@ -# -# Unisys timskmod configuration -# - -config UNISYS_VISORUTIL - tristate "Unisys visorutil driver" - ---help--- - If you say Y here, you will enable the Unisys visorutil driver. - diff --git a/drivers/staging/unisys/visorutil/Makefile b/drivers/staging/unisys/visorutil/Makefile deleted file mode 100644 index 8f6a3e3afffb..000000000000 --- a/drivers/staging/unisys/visorutil/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# Makefile for Unisys timskmod -# - -obj-$(CONFIG_UNISYS_VISORUTIL) += visorutil.o - -visorutil-y := periodic_work.o - -ccflags-y += -Idrivers/staging/unisys/include -- 2.30.2