tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

watchdog: Add HAS_IOPORT dependency for SBC8360 and SBC7240

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: 52df67b6b313 ("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>

authored by

Niklas Schnelle and committed by
Arnd Bergmann d4d3125a d533cb2d

+2 -2
+2 -2
drivers/watchdog/Kconfig
··· 1509 1509 1510 1510 config SBC8360_WDT 1511 1511 tristate "SBC8360 Watchdog Timer" 1512 - depends on X86_32 1512 + depends on X86_32 && HAS_IOPORT 1513 1513 help 1514 1514 1515 1515 This is the driver for the hardware watchdog on the SBC8360 Single ··· 1522 1522 1523 1523 config SBC7240_WDT 1524 1524 tristate "SBC Nano 7240 Watchdog Timer" 1525 - depends on X86_32 && !UML 1525 + depends on X86_32 && HAS_IOPORT 1526 1526 help 1527 1527 This is the driver for the hardware watchdog found on the IEI 1528 1528 single board computers EPIC Nano 7240 (and likely others). This