diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 11:54:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 11:54:24 +0200 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /drivers/media/video/au0828/Kconfig | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| download | op-kernel-dev-3825c9e8d01e4310c40a3903a354c433c32a7b6f.zip op-kernel-dev-3825c9e8d01e4310c40a3903a354c433c32a7b6f.tar.gz | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/au0828/Kconfig')
| -rw-r--r-- | drivers/media/video/au0828/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig index 52b2491..ed9a50f 100644 --- a/drivers/media/video/au0828/Kconfig +++ b/drivers/media/video/au0828/Kconfig @@ -6,6 +6,7 @@ config VIDEO_AU0828 select VIDEO_TVEEPROM select DVB_AU8522 if !DVB_FE_CUSTOMIZE select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE + select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMIZE ---help--- This is a video4linux driver for Auvitek's USB device. |
