Skip to content

Commit 449664d

Browse files
niklas88gregkh
authored andcommitted
watchdog: Add HAS_IOPORT dependency for SBC8360 and SBC7240
[ Upstream commit d4d3125 ] Both drivers use I/O port accesses without declaring a dependency on CONFIG_HAS_IOPORT. For sbc8360_wdt this causes a compile error on UML once inb()/outb() helpers become conditional. For sbc7240_wdt this causes no such errors with UML because this driver depends on both x86_32 and !UML. Nevertheless add HAS_IOPORT as a dependency for both drivers to be explicit and drop the !UML dependency for sbc7240_wdt as it is now redundant since UML implies no HAS_IOPORT. Fixes: 52df67b ("watchdog: add HAS_IOPORT dependencies") Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent af125e7 commit 449664d

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/watchdog/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,7 +1509,7 @@ config 60XX_WDT
15091509

15101510
config SBC8360_WDT
15111511
tristate "SBC8360 Watchdog Timer"
1512-
depends on X86_32
1512+
depends on X86_32 && HAS_IOPORT
15131513
help
15141514

15151515
This is the driver for the hardware watchdog on the SBC8360 Single
@@ -1522,7 +1522,7 @@ config SBC8360_WDT
15221522

15231523
config SBC7240_WDT
15241524
tristate "SBC Nano 7240 Watchdog Timer"
1525-
depends on X86_32 && !UML
1525+
depends on X86_32 && HAS_IOPORT
15261526
help
15271527
This is the driver for the hardware watchdog found on the IEI
15281528
single board computers EPIC Nano 7240 (and likely others). This

0 commit comments

Comments
 (0)