Merge remote-tracking branch 'regulator/topic/isl6271a' into regulator-next

[linux-2.6-microblaze.git] / drivers / media / platform / s5p-mfc / s5p_mfc_opr_v6.c

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index 7d4c5e1..66f0d04 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -1306,7 +1306,7 @@ static inline int s5p_mfc_get_new_ctx(struct s5p_mfc_dev *dev)
        int cnt;
 
        spin_lock_irqsave(&dev->condlock, flags);
-       mfc_debug(2, "Previos context: %d (bits %08lx)\n", dev->curr_ctx,
+       mfc_debug(2, "Previous context: %d (bits %08lx)\n", dev->curr_ctx,
                                                        dev->ctx_work_bits);
        new_ctx = (dev->curr_ctx + 1) % MFC_NUM_CONTEXTS;
        cnt = 0;