From 8ba340cddf93c3f395c74bade1f416853e4a9ae9 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Sun, 30 Mar 2008 23:28:59 -0300
Subject: [PATCH] --- yaml --- r: 92581 b: refs/heads/master c:
 d9aedf1fe88c04500fec269557a968e3320dd4b8 h: refs/heads/master i:   92579:
 3c0a34c123ace57eb1d080ebb2d4537479eab4ff v: v3

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

diff --git a/[refs] b/[refs]
index aadc50dcce78..66c881499326 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5da4e2c645e4324f63fd87a0f93e3d0ad6619798
+refs/heads/master: d9aedf1fe88c04500fec269557a968e3320dd4b8
diff --git a/trunk/drivers/media/video/zoran_card.h b/trunk/drivers/media/video/zoran_card.h
index 8444ca0a5f3f..1b5c4171cf9c 100644
--- a/trunk/drivers/media/video/zoran_card.h
+++ b/trunk/drivers/media/video/zoran_card.h
@@ -50,4 +50,6 @@ extern int zoran_check_jpg_settings(struct zoran *zr,
 extern void zoran_open_init_params(struct zoran *zr);
 extern void zoran_vdev_release(struct video_device *vdev);
 
+void zr36016_write(struct videocodec *codec, u16 reg, u32 val);
+
 #endif				/* __ZORAN_CARD_H__ */
diff --git a/trunk/drivers/media/video/zoran_device.c b/trunk/drivers/media/video/zoran_device.c
index 05b16a254cb3..7b60533efe45 100644
--- a/trunk/drivers/media/video/zoran_device.c
+++ b/trunk/drivers/media/video/zoran_device.c
@@ -928,11 +928,6 @@ count_reset_interrupt (struct zoran *zr)
 	return isr;
 }
 
-/* hack */
-extern void zr36016_write (struct videocodec *codec,
-			   u16                reg,
-			   u32                val);
-
 void
 jpeg_start (struct zoran *zr)
 {