m68k/q40: Undefine insl/outsl before redefining them
Geert Uytterhoeven
maintainerPATCH 1/2 m68k/q40: Undefine insl/outsl before redefining them
To use the PC parallel port driver on Q40, we need non-standard versions of the insl/outsl accessors. Make sure to undefine them first, to kill this compiler warning:
In file included from drivers/parport/parport_pc.c:67:arch/m68k/include/asm/parport.h:14:1: warning: "insl" redefined
In file included from arch/m68k/include/asm/io.h:4,
from include/linux/scatterlist.h:10,
from include/linux/dma-mapping.h:9,
from drivers/parport/parport_pc.c:54:arch/m68k/include/asm/io_mm.h:370:1: warning: this is the location of the previous definition In file included from drivers/parport/parport_pc.c:67:arch/m68k/include/asm/parport.h:15:1: warning: "outsl" redefined
In file included from arch/m68k/include/asm/io.h:4,
from include/linux/scatterlist.h:10,
from include/linux/dma-mapping.h:9,
from drivers/parport/parport_pc.c:54:arch/m68k/include/asm/io_mm.h:373:1: warning: this is the location of the previous definition
--- arch/m68k/include/asm/parport.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/m68k/include/asm/parport.h +2 -0
@@ -11,6 +11,8 @@#ifndef _ASM_M68K_PARPORT_H#define _ASM_M68K_PARPORT_H 1 +#undef insl +#undef outsl#define insl (port,buf,len) isa_insb(port,buf,(len)<<2)#define outsl (port,buf,len) isa_outsb(port,buf,(len)<<2)
Signature · 1 line
1.7.0.4
Geert Uytterhoeven
maintainerPATCH 2/2 m68k/q40: Enable PC parallel port in defconfig
Enable the PC parallel port and other related options in the Q40-specific and multi-platform defconfigs.
--- arch/m68k/configs/multi_defconfig | 2 ++ arch/m68k/configs/q40_defconfig | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-)
arch/m68k/configs/multi_defconfig +2 -0
@@ -216,6 +216,7 @@ CONFIG_DEVTMPFS=y # CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_CONNECTOR=m CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m CONFIG_PARPORT_AMIGA=m CONFIG_PARPORT_MFC3=m CONFIG_PARPORT_ATARI=m
@@ -329,6 +330,7 @@ CONFIG_ZORRO8390=y # CONFIG_NET_VENDOR_SEEQ is not set # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_DEFLATE=m
arch/m68k/configs/q40_defconfig +6 -0
@@ -201,6 +201,9 @@ CONFIG_DEVTMPFS=y # CONFIG_FIRMWARE_IN_KERNEL is not set # CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_CONNECTOR=m +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_1284=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_DRBD=m
@@ -271,6 +274,7 @@ CONFIG_NE2000=m # CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_DEFLATE=m
@@ -296,9 +300,11 @@ CONFIG_SERIO_Q40KBD=y CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set +CONFIG_PRINTER=m # CONFIG_HW_RANDOM is not set CONFIG_NTP_PPS=y CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m CONFIG_PTP_1588_CLOCK=m # CONFIG_HWMON is not set CONFIG_FB=y
Signature · 1 line
1.7.0.4