Commit aaaf9cf7 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

drivers/i2c: remove !S390 dependency, add missing GENERIC_HARDIRQS dependencies

Remove !S390 dependency from i2c Kconfig, since s390 now supports PCI, HAS_IOMEM
and HAS_DMA, however we need to add a couple of GENERIC_HARDIRQS dependecies to
fix compile and link errors like these:

ERROR: "devm_request_threaded_irq" [drivers/i2c/i2c-smbus.ko] undefined!
ERROR: "devm_request_threaded_irq" [drivers/i2c/busses/i2c-ocores.ko] undefined!

Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent aebfa669
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
menuconfig I2C menuconfig I2C
tristate "I2C support" tristate "I2C support"
depends on !S390
select RT_MUTEXES select RT_MUTEXES
---help--- ---help---
I2C (pronounce: I-squared-C) is a slow serial bus protocol used in I2C (pronounce: I-squared-C) is a slow serial bus protocol used in
...@@ -76,6 +75,7 @@ config I2C_HELPER_AUTO ...@@ -76,6 +75,7 @@ config I2C_HELPER_AUTO
config I2C_SMBUS config I2C_SMBUS
tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO
depends on GENERIC_HARDIRQS
help help
Say Y here if you want support for SMBus extensions to the I2C Say Y here if you want support for SMBus extensions to the I2C
specification. At the moment, the only supported extension is specification. At the moment, the only supported extension is
......
...@@ -114,7 +114,7 @@ config I2C_I801 ...@@ -114,7 +114,7 @@ config I2C_I801
config I2C_ISCH config I2C_ISCH
tristate "Intel SCH SMBus 1.0" tristate "Intel SCH SMBus 1.0"
depends on PCI depends on PCI && GENERIC_HARDIRQS
select LPC_SCH select LPC_SCH
help help
Say Y here if you want to use SMBus controller on the Intel SCH Say Y here if you want to use SMBus controller on the Intel SCH
...@@ -543,6 +543,7 @@ config I2C_NUC900 ...@@ -543,6 +543,7 @@ config I2C_NUC900
config I2C_OCORES config I2C_OCORES
tristate "OpenCores I2C Controller" tristate "OpenCores I2C Controller"
depends on GENERIC_HARDIRQS
help help
If you say yes to this option, support will be included for the If you say yes to this option, support will be included for the
OpenCores I2C controller. For details see OpenCores I2C controller. For details see
...@@ -777,7 +778,7 @@ config I2C_DIOLAN_U2C ...@@ -777,7 +778,7 @@ config I2C_DIOLAN_U2C
config I2C_PARPORT config I2C_PARPORT
tristate "Parallel port adapter" tristate "Parallel port adapter"
depends on PARPORT depends on PARPORT && GENERIC_HARDIRQS
select I2C_ALGOBIT select I2C_ALGOBIT
select I2C_SMBUS select I2C_SMBUS
help help
...@@ -802,6 +803,7 @@ config I2C_PARPORT ...@@ -802,6 +803,7 @@ config I2C_PARPORT
config I2C_PARPORT_LIGHT config I2C_PARPORT_LIGHT
tristate "Parallel port adapter (light)" tristate "Parallel port adapter (light)"
depends on GENERIC_HARDIRQS
select I2C_ALGOBIT select I2C_ALGOBIT
select I2C_SMBUS select I2C_SMBUS
help help
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment