diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /drivers/media/video/cx88/cx88-video.c | |
| parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
| parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 7f1931aed207..227179620d13 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
| @@ -1826,8 +1826,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, | |||
| 1826 | cx_set(MO_PCI_INTMSK, core->pci_irqmask); | 1826 | cx_set(MO_PCI_INTMSK, core->pci_irqmask); |
| 1827 | 1827 | ||
| 1828 | /* load and configure helper modules */ | 1828 | /* load and configure helper modules */ |
| 1829 | if (TUNER_ABSENT != core->board.tuner_type) | ||
| 1830 | request_module("tuner"); | ||
| 1831 | 1829 | ||
| 1832 | if (core->board.audio_chip == AUDIO_CHIP_WM8775) | 1830 | if (core->board.audio_chip == AUDIO_CHIP_WM8775) |
| 1833 | request_module("wm8775"); | 1831 | request_module("wm8775"); |