summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-eeprom.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-21 15:05:58 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-21 15:05:58 +0200
commit1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526 (patch)
treeb5691dd5aa48ac32fdbaef44afcbcc92f01592d3 /drivers/media/video/pvrusb2/pvrusb2-eeprom.h
parentx86: suppress sparse returning void warnings (diff)
parentMerge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux (diff)
downloadlinux-1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526.tar.xz
linux-1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526.zip
Merge branch 'linus' into x86/paravirt-spinlocks
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-eeprom.h')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-eeprom.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.h b/drivers/media/video/pvrusb2/pvrusb2-eeprom.h
index 84242975dea7..cca3216f94cc 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.h
@@ -1,6 +1,5 @@
/*
*
- * $Id$
*
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>