From: Tony Lindgren Date: Wed, 28 Feb 2007 11:39:28 +0000 (-0800) Subject: i2c: Merge omap i2c drivers from omap-historic X-Git-Tag: v2.6.22-omap1~72^2~15 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4636e821d4457c5f669aae8707f25b27c21b38b5;p=pandora-kernel.git i2c: Merge omap i2c drivers from omap-historic Merge omap i2c drivers from omap-historic Signed-off-by: Tony Lindgren --- diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 96867347bcbf..845fb737696b 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -5,6 +5,7 @@ menuconfig I2C tristate "I2C support" depends on HAS_IOMEM + default y if MACH_OMAP_H3 || MACH_OMAP_OSK ---help--- I2C (pronounce: I-square-C) is a slow serial bus protocol used in many micro controller applications and developed by Philips. SMBus, diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 14d1432f698b..99403f313a95 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -52,6 +52,7 @@ obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o obj-$(CONFIG_I2C_VOODOO3) += i2c-voodoo3.o obj-$(CONFIG_SCx200_ACB) += scx200_acb.o obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o +obj-$(CONFIG_I2C_OMAP) += i2c-omap.o ifeq ($(CONFIG_I2C_DEBUG_BUS),y) EXTRA_CFLAGS += -DDEBUG Reading git-diff-tree failed