Merge branch 'linus' into core/generic-dma-coherent

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

diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.h b/drivers/media/video/pvrusb2/pvrusb2-sysfs.h
index ff9373b47f8fb4734b7d48c1951ef948deb41636..6d875bfe7991e182b7e5161525a4cc8f57aee429 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.h
@@ -1,6 +1,5 @@
 /*
  *
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *