From: Niklas Schnelle Date: Mon, 22 May 2023 10:50:28 +0000 (+0200) Subject: parport: PC style parport depends on HAS_IOPORT X-Git-Tag: v6.5-rc1~77^2~75 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce3e8ec08dacba16292e1c6948f2983d1d3f1eea;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Arnd Bergmann Signed-off-by: Niklas Schnelle Link: https://lore.kernel.org/r/20230522105049.1467313-24-schnelle@linux.ibm.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 5561362224e25..631c193fe42c5 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig @@ -42,7 +42,8 @@ if PARPORT config PARPORT_PC 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 You should say Y here if you have a PC-style parallel port. All IBM PC compatible computers and some Alphas have PC-style diff --git a/include/linux/parport.h b/include/linux/parport.h index a0bc9e0267b7a..fff39bc306290 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h @@ -514,7 +514,7 @@ extern int parport_device_proc_register(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 !defined(CONFIG_PARPORT_NOT_PC) +#if !defined(CONFIG_PARPORT_NOT_PC) && defined(CONFIG_PARPORT_PC) #include #define parport_write_data(p,x) parport_pc_write_data(p,x)