superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

parport: PC style parport depends on HAS_IOPORT 

In a future patch HAS_IOPORT=n will result in inb()/outb() and friends
not being declared. As PC style parport uses these functions we need to
handle this dependency.

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>
Link: https://lore.kernel.org/r/20230522105049.1467313-24-schnelle@linux.ibm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/877/head
Niklas Schnelle 2023-05-22 12:50:28 +02:00 committed by Greg Kroah-Hartman
parent 14360031f8
commit ce3e8ec08d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/parport/Kconfig
View File

@ -42,7 +42,8 @@ if PARPORT
config PARPORT_PC config PARPORT_PC
tristate "PC-style hardware" tristate "PC-style hardware"
depends on ARCH_MIGHT_HAVE_PC_PARPORT || (PCI && !S390) depends on ARCH_MIGHT_HAVE_PC_PARPORT || PCI
depends on HAS_IOPORT
help help
You should say Y here if you have a PC-style parallel port. All You should say Y here if you have a PC-style parallel port. All
IBM PC compatible computers and some Alphas have PC-style IBM PC compatible computers and some Alphas have PC-style

2
include/linux/parport.h
View File

@ -514,7 +514,7 @@ extern int parport_device_proc_register(struct pardevice *device);
extern int parport_device_proc_unregister(struct pardevice *device); extern int parport_device_proc_unregister(struct pardevice *device);
/* If PC hardware is the only type supported, we can optimise a bit. */ /* If PC hardware is the only type supported, we can optimise a bit. */
#if !defined(CONFIG_PARPORT_NOT_PC) #if !defined(CONFIG_PARPORT_NOT_PC) && defined(CONFIG_PARPORT_PC)
#include <linux/parport_pc.h> #include <linux/parport_pc.h>
#define parport_write_data(p,x) parport_pc_write_data(p,x) #define parport_write_data(p,x) parport_pc_write_data(p,x)