From: Al Viro Date: Sun, 15 Jul 2007 20:37:16 +0000 (+0100) Subject: make i2c-acorn tristate X-Git-Tag: v2.6.23-rc1~1057 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2a9915c8a2e532f6c9b435e5f90008d601a87b90;p=linux-2.6-omap-h63xx.git make i2c-acorn tristate It depends on tristate I2C and it's trivial to make modular. The current Kconfig allows I2C=m, I2C_ACORN=y, which doesn't work at all; alternatives are dependency on I2C=y and making I2C_ACORN itself a tristate. The latter is the right thing to do... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds Acked-by: Russell King --- diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index fcde9bab5b9..1c77e14480d 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -560,7 +560,7 @@ config I2C_VERSATILE will be called i2c-versatile. config I2C_ACORN - bool "Acorn IOC/IOMD I2C bus support" + tristate "Acorn IOC/IOMD I2C bus support" depends on ARCH_ACORN default y select I2C_ALGOBIT diff --git a/drivers/i2c/busses/i2c-acorn.c b/drivers/i2c/busses/i2c-acorn.c index 09bd7f40b90..7c2be3558a2 100644 --- a/drivers/i2c/busses/i2c-acorn.c +++ b/drivers/i2c/busses/i2c-acorn.c @@ -94,4 +94,4 @@ static int __init i2c_ioc_init(void) return i2c_bit_add_bus(&ioc_ops); } -__initcall(i2c_ioc_init); +module_init(i2c_ioc_init);