4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index fc3ea4c67ccb..e705265909da 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -138,7 +138,7 @@ config VIDEOBUF_VMALLOC
        select VIDEOBUF_GEN
        tristate
-config VIDEO_BUF_DVB
+config VIDEOBUF_DVB
        tristate
 config VIDEO_BTCX
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index ebfcc7c2a89e..af60700da8c0 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -4,11 +4,11 @@ config VIDEO_CX23885
        select I2C_ALGOBIT
        select FW_LOADER
        select VIDEO_BTCX
-        select VIDEO_BUF
+        select VIDEOBUF
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
        select VIDEO_IR
-        select VIDEO_BUF_DVB
+        select VIDEOBUF_DVB
        select DVB_TUNER_MT2131 if !DVB_FE_CUSTOMISE
        select DVB_S5H1409 if !DVB_FE_CUSTOMISE
        select DVB_PLL if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index c68ba74d44ec..eeb5224ca101 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -46,7 +46,7 @@ config VIDEO_CX88_BLACKBIRD
 config VIDEO_CX88_DVB
        tristate "DVB/ATSC Support for cx2388x based TV cards"
        depends on VIDEO_CX88 && DVB_CORE
-        select VIDEO_BUF_DVB
+        select VIDEOBUF_DVB
        select DVB_PLL if !DVB_FE_CUSTOMISE
        select DVB_MT352 if !DVB_FE_CUSTOMISE
        select DVB_ZL10353 if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 82bc4ef414ac..d6d8d660196d 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -38,7 +38,7 @@ config VIDEO_SAA7134_OSS
 config VIDEO_SAA7134_DVB
        tristate "DVB/ATSC Support for saa7134 based TV cards"
        depends on VIDEO_SAA7134 && DVB_CORE
-        select VIDEO_BUF_DVB
+        select VIDEOBUF_DVB
        select FW_LOADER
        select DVB_PLL if !DVB_FE_CUSTOMISE
        select DVB_MT352 if !DVB_FE_CUSTOMISE

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index fc3ea4c67ccb..e705265909da 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig
@@ -138,7 +138,7 @@ config VIDEOBUF_VMALLOC
138	select VIDEOBUF_GEN	138	select VIDEOBUF_GEN
139	tristate	139	tristate
140		140
141	config VIDEO_BUF_DVB	141	config VIDEOBUF_DVB
142	tristate	142	tristate
143		143
144	config VIDEO_BTCX	144	config VIDEO_BTCX


diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig index ebfcc7c2a89e..af60700da8c0 100644 --- a/drivers/media/video/cx23885/Kconfig +++ b/drivers/media/video/cx23885/Kconfig
@@ -4,11 +4,11 @@ config VIDEO_CX23885
4	select I2C_ALGOBIT	4	select I2C_ALGOBIT
5	select FW_LOADER	5	select FW_LOADER
6	select VIDEO_BTCX	6	select VIDEO_BTCX
7	select VIDEO_BUF	7	select VIDEOBUF
8	select VIDEO_TUNER	8	select VIDEO_TUNER
9	select VIDEO_TVEEPROM	9	select VIDEO_TVEEPROM
10	select VIDEO_IR	10	select VIDEO_IR
11	select VIDEO_BUF_DVB	11	select VIDEOBUF_DVB
12	select DVB_TUNER_MT2131 if !DVB_FE_CUSTOMISE	12	select DVB_TUNER_MT2131 if !DVB_FE_CUSTOMISE
13	select DVB_S5H1409 if !DVB_FE_CUSTOMISE	13	select DVB_S5H1409 if !DVB_FE_CUSTOMISE
14	select DVB_PLL if !DVB_FE_CUSTOMISE	14	select DVB_PLL if !DVB_FE_CUSTOMISE


diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index c68ba74d44ec..eeb5224ca101 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig
@@ -46,7 +46,7 @@ config VIDEO_CX88_BLACKBIRD
46	config VIDEO_CX88_DVB	46	config VIDEO_CX88_DVB
47	tristate "DVB/ATSC Support for cx2388x based TV cards"	47	tristate "DVB/ATSC Support for cx2388x based TV cards"
48	depends on VIDEO_CX88 && DVB_CORE	48	depends on VIDEO_CX88 && DVB_CORE
49	select VIDEO_BUF_DVB	49	select VIDEOBUF_DVB
50	select DVB_PLL if !DVB_FE_CUSTOMISE	50	select DVB_PLL if !DVB_FE_CUSTOMISE
51	select DVB_MT352 if !DVB_FE_CUSTOMISE	51	select DVB_MT352 if !DVB_FE_CUSTOMISE
52	select DVB_ZL10353 if !DVB_FE_CUSTOMISE	52	select DVB_ZL10353 if !DVB_FE_CUSTOMISE


diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig index 82bc4ef414ac..d6d8d660196d 100644 --- a/drivers/media/video/saa7134/Kconfig +++ b/drivers/media/video/saa7134/Kconfig
@@ -38,7 +38,7 @@ config VIDEO_SAA7134_OSS
38	config VIDEO_SAA7134_DVB	38	config VIDEO_SAA7134_DVB
39	tristate "DVB/ATSC Support for saa7134 based TV cards"	39	tristate "DVB/ATSC Support for saa7134 based TV cards"
40	depends on VIDEO_SAA7134 && DVB_CORE	40	depends on VIDEO_SAA7134 && DVB_CORE
41	select VIDEO_BUF_DVB	41	select VIDEOBUF_DVB
42	select FW_LOADER	42	select FW_LOADER
43	select DVB_PLL if !DVB_FE_CUSTOMISE	43	select DVB_PLL if !DVB_FE_CUSTOMISE
44	select DVB_MT352 if !DVB_FE_CUSTOMISE	44	select DVB_MT352 if !DVB_FE_CUSTOMISE