From 6afce61560fb7f2e742bd652472649792fc51fa1 Mon Sep 17 00:00:00 2001
From: Douglas Schilling Landgraf <dougsland@gmail.com>
Date: Tue, 22 Apr 2008 14:46:12 -0300
Subject: [PATCH] --- yaml --- r: 92525 b: refs/heads/master c:
 8be38c815e181402c777e033f40971a7be19cf8b h: refs/heads/master i:   92523:
 9a6c73c3f2ef728b8463ca6d66ab6f726c9eca38 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/saa7134/saa7134.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6d469d18730a..668509078acf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 078ff7953448163d8779e489bd0119dd9a9b4732
+refs/heads/master: 8be38c815e181402c777e033f40971a7be19cf8b
diff --git a/trunk/drivers/media/video/saa7134/saa7134.h b/trunk/drivers/media/video/saa7134/saa7134.h
index ba88a1093d14..3394c47cea60 100644
--- a/trunk/drivers/media/video/saa7134/saa7134.h
+++ b/trunk/drivers/media/video/saa7134/saa7134.h
@@ -388,9 +388,7 @@ struct saa7134_fh {
 	unsigned int               radio;
 	enum v4l2_buf_type         type;
 	unsigned int               resources;
-#ifdef VIDIOC_G_PRIORITY
 	enum v4l2_priority	   prio;
-#endif
 
 	/* video overlay */
 	struct v4l2_window         win;
@@ -462,9 +460,7 @@ struct saa7134_dev {
 	struct list_head           devlist;
 	struct mutex               lock;
 	spinlock_t                 slock;
-#ifdef VIDIOC_G_PRIORITY
 	struct v4l2_prio_state     prio;
-#endif
 	/* workstruct for loading modules */
 	struct work_struct request_module_wk;