Merge branch 'linus' into x86/cleanups

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

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