Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index 273d2a1aa220f0b8a42ad41ae9722dd3c299de5c..54ac5349dee2f29d47303269cf07ee99cc26706c 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -347,7 +347,7 @@ static int pvr2_encoder_prep_config(struct pvr2_hdw *hdw)
        int encMisc3Arg = 0;
 
 #if 0
-       /* 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,