Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60a6dc55 authored by Michael Krufky's avatar Michael Krufky Committed by Linus Torvalds
Browse files

[PATCH] Kconfig: swap VIDEO_CX88_ALSA and VIDEO_CX88_DVB 



VIDEO_CX88_ALSA should not be between VIDEO_CX88_DVB and
VIDEO_CX88_DVB_ALL_FRONTENDS

When cx88-alsa was added to cx88/Kconfig, it was added in between
VIDEO_CX88_DVB and VIDEO_CX88_DVB_ALL_FRONTENDS.  This caused
undesireable effects to the appearance of the menu options in
menuconfig.

This fix reorders cx88-alsa and cx88-dvb in Kconfig, to match saa7134,
and restore the correct menuconfig appearance.

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7215fdb2

drivers/media/video/cx88/Kconfig

+14 −14
Original line number Original line Diff line number Diff line
@@ -15,20 +15,6 @@ config VIDEO_CX88 
	  To compile this driver as a module, choose M here: the

	  To compile this driver as a module, choose M here: the

	  module will be called cx8800

	  module will be called cx8800





config VIDEO_CX88_DVB

	tristate "DVB/ATSC Support for cx2388x based TV cards"

	depends on VIDEO_CX88 && DVB_CORE

	select VIDEO_BUF_DVB

	---help---

	  This adds support for DVB/ATSC cards based on the

	  Connexant 2388x chip.



	  To compile this driver as a module, choose M here: the

	  module will be called cx88-dvb.



	  You must also select one or more DVB/ATSC demodulators.

	  If you are unsure which you need, choose all of them.



config VIDEO_CX88_ALSA

config VIDEO_CX88_ALSA

	tristate "ALSA DMA audio support"

	tristate "ALSA DMA audio support"

	depends on VIDEO_CX88 && SND && EXPERIMENTAL

	depends on VIDEO_CX88 && SND && EXPERIMENTAL
@@ -44,6 +30,20 @@ config VIDEO_CX88_ALSA 
	  To compile this driver as a module, choose M here: the

	  To compile this driver as a module, choose M here: the

	  module will be called cx88-alsa.

	  module will be called cx88-alsa.





config VIDEO_CX88_DVB

	tristate "DVB/ATSC Support for cx2388x based TV cards"

	depends on VIDEO_CX88 && DVB_CORE

	select VIDEO_BUF_DVB

	---help---

	  This adds support for DVB/ATSC cards based on the

	  Connexant 2388x chip.



	  To compile this driver as a module, choose M here: the

	  module will be called cx88-dvb.



	  You must also select one or more DVB/ATSC demodulators.

	  If you are unsure which you need, choose all of them.



config VIDEO_CX88_DVB_ALL_FRONTENDS

config VIDEO_CX88_DVB_ALL_FRONTENDS

	bool "Build all supported frontends for cx2388x based TV cards"

	bool "Build all supported frontends for cx2388x based TV cards"

	default y

	default y