---

yaml --- r: 92525 b: refs/heads/master c: 8be38c8 h: refs/heads/master i: 92523: 9a6c73c v: v3
git-mirror · Apr 24, 2008 · 6afce61 · 6afce61
1 parent 148ec48
commit 6afce61
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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;