Commit aaaf9cf71c43f42285f2b1a5b54c9306f3cc3150
Committed by
Martin Schwidefsky
Martin Schwidefsky
1 parent
aebfa669d9
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
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: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Showing 2 changed files with 5 additions and 3 deletions Side-by-side Diff
drivers/i2c/Kconfig
| ... | ... | @@ -4,7 +4,6 @@ |
| 4 | 4 | |
| 5 | 5 | menuconfig I2C |
| 6 | 6 | tristate "I2C support" |
| 7 | - depends on !S390 | |
| 8 | 7 | select RT_MUTEXES |
| 9 | 8 | ---help--- |
| 10 | 9 | I2C (pronounce: I-squared-C) is a slow serial bus protocol used in |
| ... | ... | @@ -76,6 +75,7 @@ |
| 76 | 75 | |
| 77 | 76 | config I2C_SMBUS |
| 78 | 77 | tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO |
| 78 | + depends on GENERIC_HARDIRQS | |
| 79 | 79 | help |
| 80 | 80 | Say Y here if you want support for SMBus extensions to the I2C |
| 81 | 81 | specification. At the moment, the only supported extension is |
drivers/i2c/busses/Kconfig
| ... | ... | @@ -114,7 +114,7 @@ |
| 114 | 114 | |
| 115 | 115 | config I2C_ISCH |
| 116 | 116 | tristate "Intel SCH SMBus 1.0" |
| 117 | - depends on PCI | |
| 117 | + depends on PCI && GENERIC_HARDIRQS | |
| 118 | 118 | select LPC_SCH |
| 119 | 119 | help |
| 120 | 120 | Say Y here if you want to use SMBus controller on the Intel SCH |
| ... | ... | @@ -543,6 +543,7 @@ |
| 543 | 543 | |
| 544 | 544 | config I2C_OCORES |
| 545 | 545 | tristate "OpenCores I2C Controller" |
| 546 | + depends on GENERIC_HARDIRQS | |
| 546 | 547 | help |
| 547 | 548 | If you say yes to this option, support will be included for the |
| 548 | 549 | OpenCores I2C controller. For details see |
| ... | ... | @@ -777,7 +778,7 @@ |
| 777 | 778 | |
| 778 | 779 | config I2C_PARPORT |
| 779 | 780 | tristate "Parallel port adapter" |
| 780 | - depends on PARPORT | |
| 781 | + depends on PARPORT && GENERIC_HARDIRQS | |
| 781 | 782 | select I2C_ALGOBIT |
| 782 | 783 | select I2C_SMBUS |
| 783 | 784 | help |
| ... | ... | @@ -802,6 +803,7 @@ |
| 802 | 803 | |
| 803 | 804 | config I2C_PARPORT_LIGHT |
| 804 | 805 | tristate "Parallel port adapter (light)" |
| 806 | + depends on GENERIC_HARDIRQS | |
| 805 | 807 | select I2C_ALGOBIT |
| 806 | 808 | select I2C_SMBUS |
| 807 | 809 | help |