diff options
| author |   Al Viro <viro@ftp.linux.org.uk> | 2007-07-15 21:37:16 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-15 16:40:52 -0700 |
| commit | 2a9915c8a2e532f6c9b435e5f90008d601a87b90 (patch) | |
| tree | e39bfe46c624007d4d1c6c8c63c26d25457b644b /drivers/i2c | |
| parent | icside: devm_iounmap() needs linux/io.h (diff) | |
| download | linux-dev-2a9915c8a2e532f6c9b435e5f90008d601a87b90.tar.xz linux-dev-2a9915c8a2e532f6c9b435e5f90008d601a87b90.zip | |
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 <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-acorn.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index fcde9bab5b96..1c77e14480dc 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 09bd7f40b90c..7c2be3558a24 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); |