The patch titled
drivers/media/video/pwc/: make code static
has been added to the -mm tree. Its filename is
drivers-media-video-pwc-make-code-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/pwc/: make code static
From: Adrian Bunk <bunk@xxxxxxxxx>
This patch makes the following needlessly global code static:
- pwc-ctrl.c: pwc_get_leds()
- pwc_preferred_compression
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/media/video/pwc/pwc-ctrl.c | 2 +-
drivers/media/video/pwc/pwc-if.c | 2 +-
drivers/media/video/pwc/pwc.h | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff -puN drivers/media/video/pwc/pwc-ctrl.c~drivers-media-video-pwc-make-code-static drivers/media/video/pwc/pwc-ctrl.c
--- a/drivers/media/video/pwc/pwc-ctrl.c~drivers-media-video-pwc-make-code-static
+++ a/drivers/media/video/pwc/pwc-ctrl.c
@@ -925,7 +925,7 @@ int pwc_set_leds(struct pwc_device *pdev
return SendControlMsg(SET_STATUS_CTL, LED_FORMATTER, 2);
}
-int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)
+static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)
{
unsigned char buf[2];
int ret;
diff -puN drivers/media/video/pwc/pwc.h~drivers-media-video-pwc-make-code-static drivers/media/video/pwc/pwc.h
--- a/drivers/media/video/pwc/pwc.h~drivers-media-video-pwc-make-code-static
+++ a/drivers/media/video/pwc/pwc.h
@@ -274,7 +274,6 @@ extern "C" {
#if CONFIG_PWC_DEBUG
extern int pwc_trace;
#endif
-extern int pwc_preferred_compression;
extern int pwc_mbufs;
/** functions in pwc-if.c */
@@ -308,7 +307,6 @@ extern int pwc_set_gamma(struct pwc_devi
extern int pwc_get_saturation(struct pwc_device *pdev, int *value);
extern int pwc_set_saturation(struct pwc_device *pdev, int value);
extern int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value);
-extern int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value);
extern int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor);
extern int pwc_restore_user(struct pwc_device *pdev);
extern int pwc_save_user(struct pwc_device *pdev);
diff -puN drivers/media/video/pwc/pwc-if.c~drivers-media-video-pwc-make-code-static drivers/media/video/pwc/pwc-if.c
--- a/drivers/media/video/pwc/pwc-if.c~drivers-media-video-pwc-make-code-static
+++ a/drivers/media/video/pwc/pwc-if.c
@@ -133,7 +133,7 @@ static int default_fbufs = 3; /* Defau
#endif
static int power_save = 0;
static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */
- int pwc_preferred_compression = 1; /* 0..3 = uncompressed..high */
+static int pwc_preferred_compression = 1; /* 0..3 = uncompressed..high */
static struct {
int type;
char serial_number[30];
_
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
drivers-media-video-pwc-make-code-static.patch
git-gfs2.patch
make-drivers-scsi-pata_pcmciacpcmcia_remove_one-static.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-qla2xxx-make-more-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
usb-new-driver-for-cypress-cy7c63xxx-mirco-controllers-fix.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.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
chardev-gpio-for-scx200-pc-8736x-replace-spinlocks-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
