Merge commit 'v2.6.28' into core/core

[linux-2.6-omap-h63xx.git] / drivers / media / video / pvrusb2 / pvrusb2-cx2584x-v4l.h

diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h
index 54b2844e7a716ff79c4f50be76224555b8f7529a..66abf77f51fdb91f90c26ae556f81dbfeec77adf 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>