The patch titled drivers/media/video/vivi.c: make 2 functions static has been added to the -mm tree. Its filename is drivers-media-video-vivic-make-2-functions-static.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: drivers/media/video/vivi.c: make 2 functions static From: Adrian Bunk <bunk@xxxxxxxxx> Make two needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/media/video/vivi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/media/video/vivi.c~drivers-media-video-vivic-make-2-functions-static drivers/media/video/vivi.c --- a/drivers/media/video/vivi.c~drivers-media-video-vivic-make-2-functions-static +++ a/drivers/media/video/vivi.c @@ -1011,7 +1011,7 @@ static int vidiocgmbuf (struct file *fil } #endif -int vidioc_streamon (struct file *file, void *priv, enum v4l2_buf_type i) +static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i) { struct vivi_fh *fh=priv; struct vivi_dev *dev = fh->dev; @@ -1026,7 +1026,7 @@ int vidioc_streamon (struct file *file, return (videobuf_streamon(&fh->vb_vidq)); } -int vidioc_streamoff (struct file *file, void *priv, enum v4l2_buf_type i) +static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i) { struct vivi_fh *fh=priv; struct vivi_dev *dev = fh->dev; _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch git-acpi.patch acpiphp-use-new-dock-driver.patch drivers-acpi-scanc-make-acpi_bus_type-static.patch git-dvb.patch drivers-media-video-vivic-make-2-functions-static.patch git-gfs2.patch ni5010-netcard-cleanup-fix.patch git-ocfs2.patch gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-aic7xxx-possible-cleanups-2.patch swsusp-rework-memory-shrinker-rev-2.patch acx1xx-wireless-driver.patch arch-i386-kernel-apicc-make-modern_apic-static.patch kernel-power-snapshotc-cleanups.patch x86_64-unexport-ia32_sys_call_table.patch fs-locksc-make-posix_locks_deadlock-static.patch remove-config_parport_arc-drivers-parport-parport_arcc.patch fs-fat-miscc-unexport-fat_sync_bhs.patch the-scheduled-unexport-of-insert_resource.patch fs-bufferc-possible-cleanups.patch drivers-md-raid6algosc-fix-a-null-dereference.patch drivers-char-applicomc-proper-module_initexit.patch kernel-sysc-cleanups.patch kernel-sysc-cleanups-fix.patch time-i386-clocksource-drivers.patch drivers-ide-legacy-ide-csc-make-2-functions-static.patch fbdev-cleanup-the-config_video_select-mess.patch fbdev-remove-duplicate-includes.patch fbdev-remove-unused-exports.patch md-make-md_print_devices-static.patch drivers-md-mdc-make-code-static.patch slab-cache-shrinker-statistics.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch drivers-message-i2o-iopc-unexport-i2o_msg_nop.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