git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] Retry commands with UNIT_ATTENTION sense codes to fix ext3/ext4 I/O error
[safe/jmp/linux-2.6]
/
drivers
/
media
/
Kconfig
diff --git
a/drivers/media/Kconfig
b/drivers/media/Kconfig
index
7a7803b
..
a28541b
100644
(file)
--- a/
drivers/media/Kconfig
+++ b/
drivers/media/Kconfig
@@
-2,8
+2,14
@@
# Multimedia device configuration
#
# Multimedia device configuration
#
-menu "Multimedia devices"
+menuconfig MEDIA_SUPPORT
+ tristate "Multimedia support"
depends on HAS_IOMEM
depends on HAS_IOMEM
+ help
+ If you want to use Video for Linux, DVB for Linux, or DAB adapters,
+ enable this option and other options below.
+
+if MEDIA_SUPPORT
comment "Multimedia core support"
comment "Multimedia core support"
@@
-38,7
+44,6
@@
config VIDEO_ALLOW_V4L1
bool "Enable Video For Linux API 1 (DEPRECATED)"
depends on VIDEO_DEV && VIDEO_V4L2_COMMON
default VIDEO_DEV && VIDEO_V4L2_COMMON
bool "Enable Video For Linux API 1 (DEPRECATED)"
depends on VIDEO_DEV && VIDEO_V4L2_COMMON
default VIDEO_DEV && VIDEO_V4L2_COMMON
- select VIDEO_V4L1_COMPAT
---help---
Enables drivers based on the legacy V4L1 API.
---help---
Enables drivers based on the legacy V4L1 API.
@@
-49,9
+54,9
@@
config VIDEO_ALLOW_V4L1
If you are unsure as to whether this is required, answer Y.
config VIDEO_V4L1_COMPAT
If you are unsure as to whether this is required, answer Y.
config VIDEO_V4L1_COMPAT
- bool "Enable Video For Linux API 1 compatible Layer"
+ bool "Enable Video For Linux API 1 compatible Layer"
if !VIDEO_ALLOW_V4L1
depends on VIDEO_DEV
depends on VIDEO_DEV
- default
VIDEO_DEV
+ default
y
---help---
Enables a compatibility API used by most V4L2 devices to allow
its usage with legacy applications that supports only V4L1 api.
---help---
Enables a compatibility API used by most V4L2 devices to allow
its usage with legacy applications that supports only V4L1 api.
@@
-94,6
+99,7
@@
config VIDEO_MEDIA
comment "Multimedia drivers"
source "drivers/media/common/Kconfig"
comment "Multimedia drivers"
source "drivers/media/common/Kconfig"
+source "drivers/media/IR/Kconfig"
#
# Tuner drivers for DVB and V4L
#
# Tuner drivers for DVB and V4L
@@
-118,7
+124,7
@@
source "drivers/media/dvb/Kconfig"
config DAB
boolean "DAB adapters"
---help---
config DAB
boolean "DAB adapters"
---help---
- Allow selecting support for
for
Digital Audio Broadcasting (DAB)
+ Allow selecting support for Digital Audio Broadcasting (DAB)
Receiver adapters.
if DAB
Receiver adapters.
if DAB
@@
-137,4
+143,4
@@
config USB_DABUSB
module will be called dabusb.
endif # DAB
module will be called dabusb.
endif # DAB
-end
menu
+end
if # MEDIA_SUPPORT