From e3845deeb7b00d04d332219628c28b42b7b42a76 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Sun, 11 Jul 2010 22:39:55 +0200
Subject: trivial: no changes to ov511 driver

This is a partial revert of 421f91d21ad6f799dc7b489bb33cc560ccc56f98
("fix typos concerning "initiali[zs]e"") for ov511 driver, as it is
going to be completely removed in the next release anyway.

Fixes conflict in linux-next.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index 78a6eb6..a109120 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -4808,7 +4808,7 @@ ov7xx0_configure(struct usb_ov511 *ov)
 		return -1;
 
 	if (init_ov_sensor(ov) >= 0) {
-		PDEBUG(1, "OV7xx0 sensor initialized (method 1)");
+		PDEBUG(1, "OV7xx0 sensor initalized (method 1)");
 	} else {
 		/* Reset the 76xx */
 		if (i2c_w(ov, 0x12, 0x80) < 0)
-- 
cgit v0.10.2