summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-10-30 13:47:24 +0100
committerJean Delvare <khali@endymion.delvare>2011-10-30 13:47:24 +0100
commit9519282a02e74f0bf780eb371a3160824c23965a (patch)
tree31e0e4975688fb3d790a8ed48477e2b0609eaefc
parentce949717b559709423c1ef716a9db16d1dcadaed (diff)
downloadlinux-3.10-9519282a02e74f0bf780eb371a3160824c23965a.tar.gz
linux-3.10-9519282a02e74f0bf780eb371a3160824c23965a.tar.bz2
linux-3.10-9519282a02e74f0bf780eb371a3160824c23965a.zip
i2c: I2C_ELEKTOR should depend on HAS_IOPORT
On m68k, I get: drivers/i2c/busses/i2c-elektor.c: In function ‘pcf_isa_init’: drivers/i2c/busses/i2c-elektor.c:153: error: implicit declaration of function ‘ioport_map’ drivers/i2c/busses/i2c-elektor.c:153: warning: assignment makes pointer from integer without a cast drivers/i2c/busses/i2c-elektor.c: In function ‘elektor_probe’: drivers/i2c/busses/i2c-elektor.c:287: error: implicit declaration of function ‘ioport_unmap’ Since commit 82ed223c264def2b15ee4bec2e8c3048092ceb5f ("iomap: make IOPORT/PCI mapping functions conditional"), ioport_map() is only available on platforms that set HAS_IOPORT. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Jean Delvare <khali@linux-fr.org>
-rw-r--r--drivers/i2c/busses/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 646068e5100..d1fc5cf9aa4 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -789,7 +789,7 @@ config I2C_ACORN
config I2C_ELEKTOR
tristate "Elektor ISA card"
- depends on ISA && BROKEN_ON_SMP
+ depends on ISA && HAS_IOPORT && BROKEN_ON_SMP
select I2C_ALGOPCF
help
This supports the PCF8584 ISA bus I2C adapter. Say Y if you own