git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
i2c.c
diff --git
a/arch/arm/plat-omap/i2c.c
b/arch/arm/plat-omap/i2c.c
index
a4f8003
..
3341ca4
100644
(file)
--- a/
arch/arm/plat-omap/i2c.c
+++ b/
arch/arm/plat-omap/i2c.c
@@
-112,6
+112,7
@@
static inline int omap1_i2c_add_bus(int bus_id)
}
+#ifdef CONFIG_ARCH_OMAP2PLUS
/*
* XXX This function is a temporary compatibility wrapper - only
* needed until the I2C driver can be converted to call
@@
-130,7
+131,6
@@
static struct omap_device_pm_latency omap_i2c_latency[] = {
},
};
-#ifdef CONFIG_ARCH_OMAP2PLUS
static inline int omap2_i2c_add_bus(int bus_id)
{
int l;