diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 18:15:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 18:15:17 +0200 |
| commit | f3efbe582b5396d134024c03a5fa253f2a85d9a6 (patch) | |
| tree | e4e15b7567b82d24cb1e7327398286a2b88df04c /drivers/media/video/saa7134/saa7134-cards.c | |
| parent | x86, pci: iommu fix potential overflow in alloc_iommu() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | linux-f3efbe582b5396d134024c03a5fa253f2a85d9a6.tar.xz linux-f3efbe582b5396d134024c03a5fa253f2a85d9a6.zip | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 6893f998d292..98364d171def 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c @@ -5853,9 +5853,6 @@ int saa7134_board_init2(struct saa7134_dev *dev) unsigned char buf; int board; - dev->tuner_type = saa7134_boards[dev->board].tuner_type; - dev->tuner_addr = saa7134_boards[dev->board].tuner_addr; - switch (dev->board) { case SAA7134_BOARD_BMK_MPEX_NOTUNER: case SAA7134_BOARD_BMK_MPEX_TUNER: |