The patch titled git-dvb: fix the tea5761 tuner support has been removed from the -mm tree. Its filename was git-dvb-fix-the-tea5761-tuner-support.patch This patch was dropped because it is obsolete ------------------------------------------------------ Subject: git-dvb: fix the tea5761 tuner support From: Adrian Bunk <bunk@xxxxxxxxx> Due to a typo the tea5761 tuner support was dead code. This patch also fixes a bug in the no longer dead code: A void function can't return anything. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/media/video/tuner-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/media/video/tuner-core.c~git-dvb-fix-the-tea5761-tuner-support drivers/media/video/tuner-core.c --- a/drivers/media/video/tuner-core.c~git-dvb-fix-the-tea5761-tuner-support +++ a/drivers/media/video/tuner-core.c @@ -25,7 +25,7 @@ /* standard i2c insmod options */ static unsigned short normal_i2c[] = { -#ifdef CONFIG_TUNER_5761 +#ifdef CONFIG_TUNER_TEA5761 0x10, #endif 0x42, 0x43, 0x4a, 0x4b, /* tda8290 */ @@ -192,12 +192,12 @@ static void set_type(struct i2c_client * } t->mode_mask = T_RADIO; break; -#ifdef CONFIG_TUNER_5761 +#ifdef CONFIG_TUNER_TEA5761 case TUNER_TEA5761: if (tea5761_tuner_init(c) == EINVAL) { t->type = TUNER_ABSENT; t->mode_mask = T_UNINITIALIZED; - return -ENODEV; + return; } t->mode_mask = T_RADIO; break; @@ -473,7 +473,7 @@ static int tuner_attach(struct i2c_adapt /* autodetection code based on the i2c addr */ if (!no_autodetect) { switch (addr) { -#ifdef CONFIG_TUNER_5761 +#ifdef CONFIG_TUNER_TEA5761 case 0x10: if (tea5761_autodetection(&t->i2c) != EINVAL) { t->type = TUNER_TEA5761; _ Patches currently in -mm which might be from bunk@xxxxxxxxx are git-acpi.patch make-drivers-char-hvc_consoleckhvcd-static.patch git-dvb.patch git-dvb-fix-the-tea5761-tuner-support.patch git-input-make-xpad_play_effect-static.patch git-kvm.patch testing-patch-for-ali-pata-fixes-hopefully-for-the-problems-with-atapi-dma.patch git-mmc.patch nommu-make-it-possible-for-romfs-to-use-mtd-devices.patch drivers-mtd-maps-nettelc-possible-cleanups.patch git-battery.patch unexport-pci_proc_attach_device.patch git-scsi-misc.patch drivers-scsi-small-cleanups.patch drivers-scsi-wd33c93c-cleanups.patch make-seagate_st0x_detect-static.patch drivers-scsi-pcmcia-nsp_csc-remove-kernel-24-code.patch scsi-lpfc-lpfc_initc-remove-unused-variable.patch git-qla3xxx.patch git-unionfs.patch git-wireless.patch git-ipwireless_cs.patch fix-x86_64-mm-xen-add-xen-virtual-block-device-driver.patch make-arch-i386-kernel-setupcremapped_pgdat_init-static.patch arch-i386-kernel-i8253c-should-include-asm-timerh.patch make-arch-i386-kernel-io_apicctimer_irq_works-static-again.patch i386-remove-support-for-the-rise-cpu.patch i386-make-arch-i386-mm-pgtablecpgd_cdtor-static.patch maps2-add-proc-kpagemap-interface.patch lumpy-reclaim-v4.patch swsusp-remove-code-duplication-between-diskc-and-userc-fix.patch more-scheduled-oss-driver-removal.patch remove-sonypi_camera_command.patch ext2-reservations.patch revoke-core-code.patch oss-trident-fix-locking-around-write_voice_regs.patch pm3fb-possible-cleanups.patch vt8623fbc-make-code-static.patch kernel-sched_fairc-make-code-static.patch fs-proc-basec-make-a-struct-static.patch drivers-edac-core-make-functions-static.patch lockstat-human-readability-tweaks-fix.patch reiser4-export-remove_from_page_cache.patch reiser4.patch mutex-subsystem-synchro-test-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html