diff --git a/[refs] b/[refs] index 29a64439b024..2e0b3df97616 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c6beca875f0237ae9cfb2bb26144b60b9418c3a +refs/heads/master: 5fb1b2567982cffce355e4b3139a3de4430be899 diff --git a/trunk/drivers/media/video/cx231xx/Kconfig b/trunk/drivers/media/video/cx231xx/Kconfig index 7a6700fb0376..91156546a07a 100644 --- a/trunk/drivers/media/video/cx231xx/Kconfig +++ b/trunk/drivers/media/video/cx231xx/Kconfig @@ -8,11 +8,11 @@ config VIDEO_CX231XX select VIDEO_CX25840 select VIDEO_CX231XX_ALSA - ---help--- - This is a video4linux driver for Conexant 231xx USB based TV cards. + ---help--- + This is a video4linux driver for Conexant 231xx USB based TV cards. - To compile this driver as a module, choose M here: the - module will be called cx231xx + To compile this driver as a module, choose M here: the + module will be called cx231xx config VIDEO_CX231XX_ALSA tristate "Conexant Cx231xx ALSA audio module"