diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/media/Kconfig | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/media/Kconfig')
| -rw-r--r-- | drivers/media/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index ddf57e135c6c..7a7803b5d497 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig | |||
| @@ -89,8 +89,7 @@ config DVB_CORE | |||
| 89 | 89 | ||
| 90 | config VIDEO_MEDIA | 90 | config VIDEO_MEDIA |
| 91 | tristate | 91 | tristate |
| 92 | default DVB_CORE || VIDEO_DEV | 92 | default (DVB_CORE && (VIDEO_DEV = n)) || (VIDEO_DEV && (DVB_CORE = n)) || (DVB_CORE && VIDEO_DEV) |
| 93 | depends on DVB_CORE || VIDEO_DEV | ||
| 94 | 93 | ||
| 95 | comment "Multimedia drivers" | 94 | comment "Multimedia drivers" |
| 96 | 95 | ||