Merge branch 'linus' into x86/cleanups

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

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