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 make I2C core able to be a module when I2C_ACPI is selected. Original issue the commit da3c6647 tried to avoid will be fixed in ACPICA and it's rarely triggered during unloading module. Signed-off-by: Lan Tianyu <tianyu.lan@xxxxxxxxx> --- drivers/i2c/Kconfig | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 3e3b680..436ba27 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -2,9 +2,7 @@ # I2C subsystem configuration # -menu "I2C support" - -config I2C +menuconfig I2C tristate "I2C support" select RT_MUTEXES ---help--- @@ -25,8 +23,7 @@ config I2C config I2C_ACPI bool "I2C ACPI support" - select I2C - depends on ACPI + depends on I2C && ACPI default y help Say Y here if you want to enable ACPI I2C support. This includes support @@ -139,4 +136,3 @@ config I2C_DEBUG_BUS endif # I2C -endmenu -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
