diff options
| author | Lan Tianyu <tianyu.lan@intel.com> | 2014-05-20 08:59:24 -0400 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2014-06-27 08:50:41 -0400 |
| commit | da3c6647ee08711c7edc28d7fea4ad69fc5ffcca (patch) | |
| tree | 47272da395818ecc9101b27b01808b8cf11f9b35 /drivers/i2c/Makefile | |
| parent | 5d98e61d337c181f199a6cb864569cc4e116ef4c (diff) | |
I2C/ACPI: Clean up I2C ACPI code and Add CONFIG_I2C_ACPI config
Clean up ACPI related code in the i2c core and add CONFIG_I2C_ACPI
to enable I2C ACPI code.
Current there is a race between removing I2C ACPI operation region
and ACPI AML code accessing. So make i2c core built-in if CONFIG_I2C_ACPI
is set.
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
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 80db3073aa84..a1f590cbb435 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | i2ccore-y := i2c-core.o | 5 | i2ccore-y := i2c-core.o |
| 6 | i2ccore-$(CONFIG_ACPI) += i2c-acpi.o | 6 | i2ccore-$(CONFIG_I2C_ACPI) += i2c-acpi.o |
| 7 | 7 | ||
| 8 | obj-$(CONFIG_I2C_BOARDINFO) += i2c-boardinfo.o | 8 | obj-$(CONFIG_I2C_BOARDINFO) += i2c-boardinfo.o |
| 9 | obj-$(CONFIG_I2C) += i2ccore.o | 9 | obj-$(CONFIG_I2C) += i2ccore.o |