diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:09:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:09:56 -0400 |
| commit | 88e366217e8f75bd7eab64f4aa4ff9583070b0af (patch) | |
| tree | efa9d084f98749a35555afd9898b92d51d3755d2 /drivers/staging | |
| parent | a1cf64944f6f2ffe5ef30a0ee4d529db771f7db2 (diff) | |
| parent | 975f6b0c1b0efb66db455d2e76bacba06cc65541 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ASoC: OMAP: Fix DSP DAI format in McBSP DAI driver
go7007 - Add missing dependency on sound subsystem
ALSA: ps3: Add support for SPDIF/HDMI passthru
ps3: Add passthru support for non-audio streams
ps3: Add ps3av_audio_mute_analog()
ALSA: misc typo fixes
sound: add missing pcm kernel-doc
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/go7007/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig index 57a121c338c4..593fdb767aad 100644 --- a/drivers/staging/go7007/Kconfig +++ b/drivers/staging/go7007/Kconfig | |||
| @@ -1,10 +1,12 @@ | |||
| 1 | config VIDEO_GO7007 | 1 | config VIDEO_GO7007 |
| 2 | tristate "Go 7007 support" | 2 | tristate "Go 7007 support" |
| 3 | depends on VIDEO_DEV && PCI && I2C && INPUT | 3 | depends on VIDEO_DEV && PCI && I2C && INPUT |
| 4 | depends on SND | ||
| 4 | select VIDEOBUF_DMA_SG | 5 | select VIDEOBUF_DMA_SG |
| 5 | select VIDEO_IR | 6 | select VIDEO_IR |
| 6 | select VIDEO_TUNER | 7 | select VIDEO_TUNER |
| 7 | select VIDEO_TVEEPROM | 8 | select VIDEO_TVEEPROM |
| 9 | select SND_PCM | ||
| 8 | select CRC32 | 10 | select CRC32 |
| 9 | default N | 11 | default N |
| 10 | ---help--- | 12 | ---help--- |