[PATCH] USB Serial: rename ChangeLog.old

[safe/jmp/linux-2.6] / include / media / video-buf.h

diff --git a/include/media/video-buf.h b/include/media/video-buf.h
index ae6da6d..8ecfd78 100644 (file)
--- a/include/media/video-buf.h
+++ b/include/media/video-buf.h
@@ -1,5 +1,4 @@
 /*
- * $Id: video-buf.h,v 1.9 2004/11/07 13:17:15 kraxel Exp $
  *
  * generic helper functions for video4linux capture buffers, to handle
  * memory management and PCI DMA.  Right now bttv + saa7134 use it.
@@ -18,7 +17,7 @@
  * (at your option) any later version.
  */
 
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 
 #define UNSET (-1U)
 
@@ -178,7 +177,7 @@ struct videobuf_queue_ops {
 };
 
 struct videobuf_queue {
-        struct semaphore           lock;
+       struct semaphore           lock;
        spinlock_t                 *irqlock;
        struct pci_dev             *pci;