From: Shubhrajyoti D <shubhrajyoti@ti.com>
Date: Wed, 3 Aug 2011 08:28:08 +0000 (+0530)
Subject: OMAP4: I2C: Enable the wakeup in I2C_WE
X-Git-Tag: v3.2-rc1~100^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb28e5823588cc357865cc0eab2afeec90e1f057;p=pandora-kernel.git

OMAP4: I2C: Enable the wakeup in I2C_WE

Currently for OMAP4 the I2C_WE is not programmed.
This patch enables the programming for OMAP4.

This patch fixes a bad conflict resolution.
This effectively restores the following commit

Commit 120bdaa47[i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup]

which got changed by

Commit a3a7acbc[I2C: OMAP2+: address confused probed version naming]

Reviewed-by: Felipe Balbi <balbi@ti.com>
Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---

Reading git-diff-tree failed