Message ID | 20240405142226.144216-2-schnelle@linux.ibm.com |
---|---|
State | Accepted |
Commit | 59c9450b881190b497a0a61ab793a5a1b6bd006d |
Headers | show |
Series | pnp: Handle HAS_IOPORT dependencies | expand |
On Fri, Apr 5, 2024 at 4:26 PM Niklas Schnelle <schnelle@linux.ibm.com> wrote: > > In a future patch HAS_IOPORT=n will disable inb()/outb() and friends at > compile time. We thus need to depend on HAS_IOPORT even when compile > testing only. > > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > Co-developed-by: Arnd Bergmann <arnd@kernel.org> > Signed-off-by: Arnd Bergmann <arnd@kernel.org> > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> > --- > Note: This patch does not depend any not-yet-mainline HAS_IOPORT changes > and may be merged via subsystem specific trees at your earliest > convenience. > > drivers/pnp/isapnp/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pnp/isapnp/Kconfig b/drivers/pnp/isapnp/Kconfig > index 8b5f2e461a80..8e5dec59e342 100644 > --- a/drivers/pnp/isapnp/Kconfig > +++ b/drivers/pnp/isapnp/Kconfig > @@ -4,7 +4,7 @@ > # > config ISAPNP > bool "ISA Plug and Play support" > - depends on ISA || COMPILE_TEST > + depends on ISA || (HAS_IOPORT && COMPILE_TEST) > help > Say Y here if you would like support for ISA Plug and Play devices. > Some information is in <file:Documentation/userspace-api/isapnp.rst>. > -- Applied as 6.10 material, thanks!
diff --git a/drivers/pnp/isapnp/Kconfig b/drivers/pnp/isapnp/Kconfig index 8b5f2e461a80..8e5dec59e342 100644 --- a/drivers/pnp/isapnp/Kconfig +++ b/drivers/pnp/isapnp/Kconfig @@ -4,7 +4,7 @@ # config ISAPNP bool "ISA Plug and Play support" - depends on ISA || COMPILE_TEST + depends on ISA || (HAS_IOPORT && COMPILE_TEST) help Say Y here if you would like support for ISA Plug and Play devices. Some information is in <file:Documentation/userspace-api/isapnp.rst>.