i2c: move acpi code back into the core
authorWolfram Sang <wsa@the-dreams.de>
Mon, 22 Sep 2014 17:41:00 +0000 (19:41 +0200)
committerWolfram Sang <wsa@the-dreams.de>
Thu, 25 Sep 2014 14:07:15 +0000 (16:07 +0200)
commit17f4a5c47f28de9ea59182f48d07f8c44ee5dcc9
tree05959f33300e0e93cb9b8f4ffb29ef593521c37e
parentb4a7bd7a386dc6b0bb49cb47614e06e8295d495a
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>
MAINTAINERS
drivers/i2c/Makefile
drivers/i2c/i2c-acpi.c [deleted file]
drivers/i2c/i2c-core.c
include/linux/i2c.h