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/Makefile | |
parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) | |
download | op-kernel-dev-366047515c6eab2ff886bc28d1c2b0ad041d040a.zip op-kernel-dev-366047515c6eab2ff886bc28d1c2b0ad041d040a.tar.gz |
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/Makefile')
-rw-r--r-- | drivers/i2c/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index a1f590c..e0228b2 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -3,7 +3,7 @@ # i2ccore-y := i2c-core.o -i2ccore-$(CONFIG_I2C_ACPI) += i2c-acpi.o +i2ccore-$(CONFIG_ACPI) += i2c-acpi.o obj-$(CONFIG_I2C_BOARDINFO) += i2c-boardinfo.o obj-$(CONFIG_I2C) += i2ccore.o |