From 9734b25e9b468a8c70ab6eef4f1cad8e47722151 Mon Sep 17 00:00:00 2001 From: "Daniel M. Weeks" Date: Tue, 6 Nov 2012 23:51:05 -0500 Subject: [PATCH] --- yaml --- r: 335815 b: refs/heads/master c: cbf24fad8e6e97b7cd7dd1099f5b801689dc234a h: refs/heads/master i: 335813: a4b6d88d3ed0c6b8b7158c12a5e5458159528321 335811: c6528f620f2c6627723e0b4ce6285711d9631f55 335807: fbe74a06c3a8cfc0b6e51e7fb5e2db62a9cfecc3 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-mcp23s08.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f0bb9f60f7b6..5dc74b18f753 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb144fe8e0e70ccb12e93c9c9f010a25b3f2a158 +refs/heads/master: cbf24fad8e6e97b7cd7dd1099f5b801689dc234a diff --git a/trunk/drivers/gpio/gpio-mcp23s08.c b/trunk/drivers/gpio/gpio-mcp23s08.c index 0f425189de11..ce1c84760076 100644 --- a/trunk/drivers/gpio/gpio-mcp23s08.c +++ b/trunk/drivers/gpio/gpio-mcp23s08.c @@ -77,7 +77,7 @@ struct mcp23s08_driver_data { /*----------------------------------------------------------------------*/ -#ifdef CONFIG_I2C +#if IS_ENABLED(CONFIG_I2C) static int mcp23008_read(struct mcp23s08 *mcp, unsigned reg) { @@ -399,7 +399,7 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, break; #endif /* CONFIG_SPI_MASTER */ -#ifdef CONFIG_I2C +#if IS_ENABLED(CONFIG_I2C) case MCP_TYPE_008: mcp->ops = &mcp23008_ops; mcp->chip.ngpio = 8; @@ -473,7 +473,7 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, /*----------------------------------------------------------------------*/ -#ifdef CONFIG_I2C +#if IS_ENABLED(CONFIG_I2C) static int __devinit mcp230xx_probe(struct i2c_client *client, const struct i2c_device_id *id)