diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 22:10:12 +0200 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 22:10:12 +0200 |
commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /drivers/media/video/pvrusb2/pvrusb2-wm8775.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
parent | [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB (diff) | |
download | linux-af7a535688a758d15f06a98833e6a143b29af9de.tar.xz linux-af7a535688a758d15f06a98833e6a143b29af9de.zip |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-wm8775.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-wm8775.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c index 66b4d36ef765..f6fcf0ac6118 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c +++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c @@ -1,6 +1,5 @@ /* * - * $Id$ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> |