mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
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: 52df67b6b3
("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>
This commit is contained in:
parent
d533cb2d2a
commit
d4d3125a34
@ -1509,7 +1509,7 @@ config 60XX_WDT
|
||||
|
||||
config SBC8360_WDT
|
||||
tristate "SBC8360 Watchdog Timer"
|
||||
depends on X86_32
|
||||
depends on X86_32 && HAS_IOPORT
|
||||
help
|
||||
|
||||
This is the driver for the hardware watchdog on the SBC8360 Single
|
||||
@ -1522,7 +1522,7 @@ config SBC8360_WDT
|
||||
|
||||
config SBC7240_WDT
|
||||
tristate "SBC Nano 7240 Watchdog Timer"
|
||||
depends on X86_32 && !UML
|
||||
depends on X86_32 && HAS_IOPORT
|
||||
help
|
||||
This is the driver for the hardware watchdog found on the IEI
|
||||
single board computers EPIC Nano 7240 (and likely others). This
|
||||
|
Loading…
Reference in New Issue
Block a user