diff --git a/[refs] b/[refs] index 120ed0540631..5a92ad6540d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3735edf9fd8bfa6e31025a7cc73447516278000b +refs/heads/master: 9a78efc8fbd6776cd0f704be9cac7b013f3d3d16 diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig index c2ee0aa53db9..9575db429df4 100644 --- a/trunk/drivers/media/Kconfig +++ b/trunk/drivers/media/Kconfig @@ -89,11 +89,13 @@ config DVB_NET default (NET && INET) depends on NET && INET && DVB_CORE help - The DVB network support in the DVB core can - optionally be disabled if this - option is set to N. + This option enables DVB Network Support which is a part of the DVB + standard. It is used, for example, by automatic firmware updates used + on Set-Top-Boxes. It can also be used to access the Internet via the + DVB card, if the network provider supports it. - If unsure say Y. + You may want to disable the network support on embedded devices. If + unsure say Y. config VIDEO_MEDIA tristate