diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-20 12:28:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-20 12:28:31 -0300 |
| commit | cf4fba74c077b53d2dc084f90a559b31265dd772 (patch) | |
| tree | b7f45bf378c19811c8a601b237e077598997b445 /linux/drivers | |
| parent | 76942dc03d982eb126ab1f62f4832b797c1119ca (diff) | |
| parent | a053ae2d2e29f959bc6fd2ec190963df9a24a48e (diff) | |
| download | mediapointer-dvb-s2-cf4fba74c077b53d2dc084f90a559b31265dd772.tar.gz mediapointer-dvb-s2-cf4fba74c077b53d2dc084f90a559b31265dd772.tar.bz2 | |
merge: http://hg.jannau.net/hdpvr-merge/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/hdpvr/hdpvr-control.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/hdpvr/hdpvr-core.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/hdpvr/hdpvr-i2c.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/hdpvr/hdpvr-video.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/hdpvr/hdpvr.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/hdpvr/hdpvr-control.c b/linux/drivers/media/video/hdpvr/hdpvr-control.c index ecf02c621..51de74aeb 100644 --- a/linux/drivers/media/video/hdpvr/hdpvr-control.c +++ b/linux/drivers/media/video/hdpvr/hdpvr-control.c @@ -1,5 +1,5 @@ /* - * Hauppage HD PVR USB driver - video 4 linux 2 interface + * Hauppauge HD PVR USB driver - video 4 linux 2 interface * * Copyright (C) 2008 Janne Grunau (j@jannau.net) * diff --git a/linux/drivers/media/video/hdpvr/hdpvr-core.c b/linux/drivers/media/video/hdpvr/hdpvr-core.c index a33b03df0..4a2bbb72b 100644 --- a/linux/drivers/media/video/hdpvr/hdpvr-core.c +++ b/linux/drivers/media/video/hdpvr/hdpvr-core.c @@ -1,5 +1,5 @@ /* - * Hauppage HD PVR USB driver + * Hauppauge HD PVR USB driver * * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com) * Copyright (C) 2008 Janne Grunau (j@jannau.net) diff --git a/linux/drivers/media/video/hdpvr/hdpvr-i2c.c b/linux/drivers/media/video/hdpvr/hdpvr-i2c.c index 35096dec2..c4b5d1515 100644 --- a/linux/drivers/media/video/hdpvr/hdpvr-i2c.c +++ b/linux/drivers/media/video/hdpvr/hdpvr-i2c.c @@ -1,6 +1,6 @@ /* - * Hauppage HD PVR USB driver + * Hauppauge HD PVR USB driver * * Copyright (C) 2008 Janne Grunau (j@jannau.net) * diff --git a/linux/drivers/media/video/hdpvr/hdpvr-video.c b/linux/drivers/media/video/hdpvr/hdpvr-video.c index 6dd11f490..235978003 100644 --- a/linux/drivers/media/video/hdpvr/hdpvr-video.c +++ b/linux/drivers/media/video/hdpvr/hdpvr-video.c @@ -1,5 +1,5 @@ /* - * Hauppage HD PVR USB driver - video 4 linux 2 interface + * Hauppauge HD PVR USB driver - video 4 linux 2 interface * * Copyright (C) 2008 Janne Grunau (j@jannau.net) * diff --git a/linux/drivers/media/video/hdpvr/hdpvr.h b/linux/drivers/media/video/hdpvr/hdpvr.h index 17db74feb..9bc8051b5 100644 --- a/linux/drivers/media/video/hdpvr/hdpvr.h +++ b/linux/drivers/media/video/hdpvr/hdpvr.h @@ -1,5 +1,5 @@ /* - * Hauppage HD PVR USB driver + * Hauppauge HD PVR USB driver * * Copyright (C) 2008 Janne Grunau (j@jannau.net) * diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c index 744bc192c..452981827 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c @@ -380,7 +380,7 @@ static int pvr2_encoder_prep_config(struct pvr2_hdw *hdw) int encMisc3Arg = 0; #if 0 /* keep */ - /* This inexplicable bit happens in the Hauppage windows + /* This inexplicable bit happens in the Hauppauge windows driver (for both 24xxx and 29xxx devices). However I currently see no difference in behavior with or without this stuff. Leave this here as a note of its existence, |