Merge branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / media / video / zoran / zoran.h

diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index 4bb368e..f3f6400 100644 (file)
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -259,7 +259,7 @@ struct card_info {
        struct vfe_polarity vfe_pol;
        u8 gpio_pol[ZR_GPIO_MAX];
 
-       /* is the /GWS line conected? */
+       /* is the /GWS line connected? */
        u8 gws_not_connected;
 
        /* avs6eyes mux setting */