diff options
| author | Erik Arfvidson | 2015-05-05 18:37:07 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-05-08 15:27:32 +0200 |
| commit | 53490b545cb07c9d2e1b36aa680afaf0d435aec8 (patch) | |
| tree | b52e0886323239e4b41a41445325d61bce96e859 | |
| parent | c0a14641b1c6b9e85f94370ea3610ca486ca568f (diff) | |
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 <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/unisys/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorbus/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorbus/periodic_work.c (renamed from drivers/staging/unisys/visorutil/periodic_work.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorutil/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorutil/Makefile | 9 |
5 files changed, 1 insertions, 19 deletions
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 index 3562e8b2824b..3562e8b2824b 100644 --- a/drivers/staging/unisys/visorutil/periodic_work.c +++ b/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 |