From: Christian Gromm Date: Tue, 21 Nov 2017 14:04:40 +0000 (+0100) Subject: staging: most: sound: rename module X-Git-Tag: v4.16-rc1~112^2~579 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88c975497da8a16e07dc6ac2e5d51b187014fe42;p=thirdparty%2Fkernel%2Flinux.git staging: most: sound: rename module This patch renames the folder of the sound module. It is needed to clean up the directory layout of the driver. Signed-off-by: Christian Gromm Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/most/Kconfig b/drivers/staging/most/Kconfig index 68a9c89db22ac..3f127116476c9 100644 --- a/drivers/staging/most/Kconfig +++ b/drivers/staging/most/Kconfig @@ -21,7 +21,7 @@ source "drivers/staging/most/cdev/Kconfig" source "drivers/staging/most/net/Kconfig" -source "drivers/staging/most/aim-sound/Kconfig" +source "drivers/staging/most/sound/Kconfig" source "drivers/staging/most/aim-v4l2/Kconfig" diff --git a/drivers/staging/most/aim-sound/Kconfig b/drivers/staging/most/sound/Kconfig similarity index 72% rename from drivers/staging/most/aim-sound/Kconfig rename to drivers/staging/most/sound/Kconfig index 3194c219ff142..115262a58a427 100644 --- a/drivers/staging/most/aim-sound/Kconfig +++ b/drivers/staging/most/sound/Kconfig @@ -2,12 +2,12 @@ # MOST ALSA configuration # -config AIM_SOUND - tristate "ALSA AIM" +config MOST_SOUND + tristate "Sound" depends on SND select SND_PCM ---help--- Say Y here if you want to commumicate via ALSA/sound devices. To compile this driver as a module, choose M here: the - module will be called aim_sound. + module will be called most_sound. diff --git a/drivers/staging/most/sound/Makefile b/drivers/staging/most/sound/Makefile new file mode 100644 index 0000000000000..eee8774e38cb1 --- /dev/null +++ b/drivers/staging/most/sound/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_MOST_SOUND) += most_sound.o + +most_sound-objs := sound.o +ccflags-y += -Idrivers/staging/ diff --git a/drivers/staging/most/aim-sound/sound.c b/drivers/staging/most/sound/sound.c similarity index 100% rename from drivers/staging/most/aim-sound/sound.c rename to drivers/staging/most/sound/sound.c