diff options
| author |   Lan Tianyu <tianyu.lan@intel.com> | 2014-08-15 13:38:59 +0800 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2014-08-19 10:19:39 -0500 |
| commit | 366047515c6eab2ff886bc28d1c2b0ad041d040a (patch) | |
| tree | 5cb391fb269e26814318a138b15642a3e5c94c2d /drivers/i2c/i2c-acpi.c | |
| parent | Linux 3.17-rc1 (diff) | |
| download | linux-dev-366047515c6eab2ff886bc28d1c2b0ad041d040a.tar.xz linux-dev-366047515c6eab2ff886bc28d1c2b0ad041d040a.zip | |
i2c: rework kernel config I2C_ACPI
Commit da3c6647(I2C/ACPI: Clean up I2C ACPI code and Add CONFIG_I2C_ACPI
config) adds a new kernel config I2C_ACPI and make I2C core built in
when the config is selected. This is wrong because distributions
etc generally compile I2C as a module and the commit broken that.
This patch is to rename I2C_ACPI to ACPI_I2C_OPREGION. New config
only controls ACPI I2C operation region code and depends on I2C=y.
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
[wsa: removed unrelated change for Kconfig]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/i2c-acpi.c')
| -rw-r--r-- | drivers/i2c/i2c-acpi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-acpi.c b/drivers/i2c/i2c-acpi.c index e8b61967334b..0dbc18c15c43 100644 --- a/drivers/i2c/i2c-acpi.c +++ b/drivers/i2c/i2c-acpi.c @@ -126,6 +126,7 @@ void acpi_i2c_register_devices(struct i2c_adapter *adap) dev_warn(&adap->dev, "failed to enumerate I2C slaves\n"); } +#ifdef CONFIG_ACPI_I2C_OPREGION static int acpi_gsb_i2c_read_bytes(struct i2c_client *client, u8 cmd, u8 *data, u8 data_len) { @@ -360,3 +361,4 @@ void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter) acpi_bus_detach_private_data(handle); } +#endif |