From 9c7201bfd94e30cfabfa86d31e7b698a1a007d94 Mon Sep 17 00:00:00 2001 From: Christian Gromm Date: Tue, 21 Nov 2017 15:04:39 +0100 Subject: [PATCH] staging: most: net: rename module This patch renames the folder and the source file of the networking module. It is needed to clean up the directory layout of the driver. Signed-off-by: Christian Gromm Signed-off-by: Greg Kroah-Hartman --- drivers/staging/most/Kconfig | 2 +- drivers/staging/most/{aim-network => net}/Kconfig | 6 +++--- drivers/staging/most/net/Makefile | 4 ++++ drivers/staging/most/{aim-network/networking.c => net/net.c} | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) rename drivers/staging/most/{aim-network => net}/Kconfig (69%) create mode 100644 drivers/staging/most/net/Makefile rename drivers/staging/most/{aim-network/networking.c => net/net.c} (99%) diff --git a/drivers/staging/most/Kconfig b/drivers/staging/most/Kconfig index 88a415b..68a9c89 100644 --- a/drivers/staging/most/Kconfig +++ b/drivers/staging/most/Kconfig @@ -19,7 +19,7 @@ if MOST source "drivers/staging/most/cdev/Kconfig" -source "drivers/staging/most/aim-network/Kconfig" +source "drivers/staging/most/net/Kconfig" source "drivers/staging/most/aim-sound/Kconfig" diff --git a/drivers/staging/most/aim-network/Kconfig b/drivers/staging/most/net/Kconfig similarity index 69% rename from drivers/staging/most/aim-network/Kconfig rename to drivers/staging/most/net/Kconfig index 4c66b24..795330b 100644 --- a/drivers/staging/most/aim-network/Kconfig +++ b/drivers/staging/most/net/Kconfig @@ -2,12 +2,12 @@ # MOST Networking configuration # -config AIM_NETWORK - tristate "Networking AIM" +config MOST_NET + tristate "Net" depends on NET ---help--- Say Y here if you want to commumicate via a networking device. To compile this driver as a module, choose M here: the - module will be called aim_network. + module will be called most_net. diff --git a/drivers/staging/most/net/Makefile b/drivers/staging/most/net/Makefile new file mode 100644 index 0000000..54500aa --- /dev/null +++ b/drivers/staging/most/net/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_MOST_NET) += most_net.o + +most_net-objs := net.o +ccflags-y += -Idrivers/staging/ diff --git a/drivers/staging/most/aim-network/networking.c b/drivers/staging/most/net/net.c similarity index 99% rename from drivers/staging/most/aim-network/networking.c rename to drivers/staging/most/net/net.c index 5e082d7..3cbd403 100644 --- a/drivers/staging/most/aim-network/networking.c +++ b/drivers/staging/most/net/net.c @@ -496,7 +496,7 @@ put_nd: } static struct most_aim aim = { - .name = "networking", + .name = "net", .probe_channel = aim_probe_channel, .disconnect_channel = aim_disconnect_channel, .tx_completion = aim_resume_tx_channel, -- 2.7.4