Shubhrajyoti D cb28e58235 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>		2011-10-29 09:37:09 +01:00
..
algos	i2c-algo-bit: Call pre/post_xfer for bit_test	2011-04-17 10:20:19 +02:00
busses	OMAP4: I2C: Enable the wakeup in I2C_WE	2011-10-29 09:37:09 +01:00
muxes	i2c/pca954x: Initialize the mux to disconnected state	2011-06-29 11:36:11 +02:00
i2c-boardinfo.c	i2c-boardinfo: Fix typo in comment	2011-03-20 14:50:52 +01:00
i2c-core.c	i2c: Allow i2c_add_numbered_adapter() to assign a bus id	2011-07-25 17:49:43 +02:00
i2c-core.h
i2c-dev.c	i2c-dev: Use standard bus notification mechanism	2011-03-20 14:50:52 +01:00
i2c-mux.c
i2c-smbus.c
Kconfig	doc: Kconfig: Typo: square -> squared	2011-07-11 14:22:32 +02:00
Makefile	i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter	2011-03-20 14:50:53 +01:00