summaryrefslogtreecommitdiff
path: root/drivers/i2c/Makefile
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2014-09-22 19:41:00 +0200
committerWolfram Sang <wsa@the-dreams.de>2014-09-25 16:07:15 +0200
commit17f4a5c47f28de9ea59182f48d07f8c44ee5dcc9 (patch)
tree05959f33300e0e93cb9b8f4ffb29ef593521c37e /drivers/i2c/Makefile
parentb4a7bd7a386dc6b0bb49cb47614e06e8295d495a (diff)
i2c: move acpi code back into the core
Commit 5d98e61d337c ("I2C/ACPI: Add i2c ACPI operation region support") renamed the i2c-core module. This may cause regressions for distributions, so put the ACPI code back into the core. Reported-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Tested-by: Lan Tianyu <tianyu.lan@intel.com> Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/i2c/Makefile')
-rw-r--r--drivers/i2c/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index e0228b228256..1722f50f2473 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -2,11 +2,8 @@
# Makefile for the i2c core.
#
-i2ccore-y := i2c-core.o
-i2ccore-$(CONFIG_ACPI) += i2c-acpi.o
-
obj-$(CONFIG_I2C_BOARDINFO) += i2c-boardinfo.o
-obj-$(CONFIG_I2C) += i2ccore.o
+obj-$(CONFIG_I2C) += i2c-core.o
obj-$(CONFIG_I2C_SMBUS) += i2c-smbus.o
obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o
obj-$(CONFIG_I2C_MUX) += i2c-mux.o