aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-16 08:21:17 +0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-16 08:21:17 +0700
commita9bdddb8dd711d70c5e0068fd8ad5ae5f4419359 (patch)
treef896eac7b042a60246fb0c200b465eeca1d60411
parent2e67c56248b776c0a546925c796cdb167ee4d7a0 (diff)
parent2fac2b891f287691c27ee8d2eeecf39571b27fea (diff)
downloadlinux-a9bdddb8dd711d70c5e0068fd8ad5ae5f4419359.tar.gz
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c bugfix from Wolfram Sang. * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: Re-instate body of i2c_parent_is_i2c_adapter()
-rw-r--r--include/linux/i2c.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index eff50e062be..d9c8dbd3373 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -445,7 +445,7 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
static inline struct i2c_adapter *
i2c_parent_is_i2c_adapter(const struct i2c_adapter *adapter)
{
-#if IS_ENABLED(I2C_MUX)
+#if IS_ENABLED(CONFIG_I2C_MUX)
struct device *parent = adapter->dev.parent;
if (parent != NULL && parent->type == &i2c_adapter_type)