From ac9beca0f432a33de17cf16b20c797f044ad7330 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <elezegarcia@gmail.com>
Date: Sat, 28 Apr 2012 09:57:01 -0300
Subject: [PATCH] --- yaml --- r: 306407 b: refs/heads/master c:
 60332f033d4c8655e0afcea932e16d44646e82bf h: refs/heads/master i:   306405:
 3ceb45ec721fe377254451bb50832a0717b31bb2   306403:
 9016ec90826dad04586c3dae17f93c1cff9fcbd5   306399:
 1f415d4a094ee39e325285b20cb86434193aa115 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-cards.c | 6 ++++--
 trunk/drivers/media/video/em28xx/em28xx.h       | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 22867b4b3a6c..d6205f51cd66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 152a3a7320d1582009db85d8be365ce430d079af
+refs/heads/master: 60332f033d4c8655e0afcea932e16d44646e82bf
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index 0ac117c23c47..5dd6806c75ab 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -69,6 +69,8 @@ struct em28xx_hash_table {
 	unsigned int  tuner;
 };
 
+static void em28xx_pre_card_setup(struct em28xx *dev);
+
 /*
  *  Reset sequences for analog/digital modes
  */
@@ -2361,7 +2363,7 @@ static int em28xx_hint_sensor(struct em28xx *dev)
 /* Since em28xx_pre_card_setup() requires a proper dev->model,
  * this won't work for boards with generic PCI IDs
  */
-void em28xx_pre_card_setup(struct em28xx *dev)
+static void em28xx_pre_card_setup(struct em28xx *dev)
 {
 	/* Set the initial XCLK and I2C clock values based on the board
 	   definition */
@@ -2661,7 +2663,7 @@ static int em28xx_hint_board(struct em28xx *dev)
 	return -1;
 }
 
-void em28xx_card_setup(struct em28xx *dev)
+static void em28xx_card_setup(struct em28xx *dev)
 {
 	/*
 	 * If the device can be a webcam, seek for a sensor.
diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h
index 9a2bd5c40163..9486eacc6e0f 100644
--- a/trunk/drivers/media/video/em28xx/em28xx.h
+++ b/trunk/drivers/media/video/em28xx/em28xx.h
@@ -698,8 +698,6 @@ void em28xx_release_analog_resources(struct em28xx *dev);
 
 /* Provided by em28xx-cards.c */
 extern int em2800_variant_detect(struct usb_device *udev, int model);
-extern void em28xx_pre_card_setup(struct em28xx *dev);
-extern void em28xx_card_setup(struct em28xx *dev);
 extern struct em28xx_board em28xx_boards[];
 extern struct usb_device_id em28xx_id_table[];
 extern const unsigned int em28xx_bcount;