Skip to content

Commit

Permalink
drivers/i2c: remove !S390 dependency, add missing GENERIC_HARDIRQS de…
Browse files Browse the repository at this point in the history
…pendencies

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: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Mar 11, 2013
1 parent aebfa66 commit aaaf9cf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/i2c/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

menuconfig I2C
tristate "I2C support"
depends on !S390
select RT_MUTEXES
---help---
I2C (pronounce: I-squared-C) is a slow serial bus protocol used in
Expand Down Expand Up @@ -76,6 +75,7 @@ config I2C_HELPER_AUTO

config I2C_SMBUS
tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO
depends on GENERIC_HARDIRQS
help
Say Y here if you want support for SMBus extensions to the I2C
specification. At the moment, the only supported extension is
Expand Down
6 changes: 4 additions & 2 deletions drivers/i2c/busses/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ config I2C_I801

config I2C_ISCH
tristate "Intel SCH SMBus 1.0"
depends on PCI
depends on PCI && GENERIC_HARDIRQS
select LPC_SCH
help
Say Y here if you want to use SMBus controller on the Intel SCH
Expand Down Expand Up @@ -543,6 +543,7 @@ config I2C_NUC900

config I2C_OCORES
tristate "OpenCores I2C Controller"
depends on GENERIC_HARDIRQS
help
If you say yes to this option, support will be included for the
OpenCores I2C controller. For details see
Expand Down Expand Up @@ -777,7 +778,7 @@ config I2C_DIOLAN_U2C

config I2C_PARPORT
tristate "Parallel port adapter"
depends on PARPORT
depends on PARPORT && GENERIC_HARDIRQS
select I2C_ALGOBIT
select I2C_SMBUS
help
Expand All @@ -802,6 +803,7 @@ config I2C_PARPORT

config I2C_PARPORT_LIGHT
tristate "Parallel port adapter (light)"
depends on GENERIC_HARDIRQS
select I2C_ALGOBIT
select I2C_SMBUS
help
Expand Down

0 comments on commit aaaf9cf

Please sign in to comment.