diff options
| -rw-r--r-- | drivers/staging/most/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/most/sound/Kconfig (renamed from drivers/staging/most/aim-sound/Kconfig) | 6 | ||||
| -rw-r--r-- | drivers/staging/most/sound/Makefile | 4 | ||||
| -rw-r--r-- | drivers/staging/most/sound/sound.c (renamed from drivers/staging/most/aim-sound/sound.c) | 0 |
4 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/most/Kconfig b/drivers/staging/most/Kconfig index 68a9c89db22a..3f127116476c 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 index 3194c219ff14..115262a58a42 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 000000000000..eee8774e38cb --- /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 index 5826f710c925..5826f710c925 100644 --- a/drivers/staging/most/aim-sound/sound.c +++ b/drivers/staging/most/sound/sound.c |