From f89487adce94b18e6f570ffbdf6c46f69525ebeb Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Thu, 18 Sep 2014 15:16:01 +1000 Subject: m68knommu: add missing ioport_map() and ioport_unmap() Add the missing ioport_map() and ioport_unmap() functions for the non-MMU platforms. Signed-off-by: Greg Ungerer --- arch/m68k/include/asm/io_no.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'arch/m68k/include/asm') diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index 52f7e849917..be4b5a813ad 100644 --- a/arch/m68k/include/asm/io_no.h +++ b/arch/m68k/include/asm/io_no.h @@ -179,6 +179,15 @@ static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size */ #define xlate_dev_kmem_ptr(p) p +static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) +{ + return (void __iomem *) port; +} + +static inline void ioport_unmap(void __iomem *p) +{ +} + #endif /* __KERNEL__ */ #endif /* _M68KNOMMU_IO_H */ -- cgit v1.2.3-70-g09d2 From e803d4bd31184b301a54352bb2c1a3fa93f80154 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Fri, 26 Sep 2014 19:40:16 +0200 Subject: m68k: Fix typo 'COFNIG_MBAR' Signed-off-by: Paul Bolle Signed-off-by: Greg Ungerer --- arch/m68k/include/asm/m54xxpci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/m68k/include/asm') diff --git a/arch/m68k/include/asm/m54xxpci.h b/arch/m68k/include/asm/m54xxpci.h index 6fbf54f72f2..4687f5aa374 100644 --- a/arch/m68k/include/asm/m54xxpci.h +++ b/arch/m68k/include/asm/m54xxpci.h @@ -72,7 +72,7 @@ #define PCIRFWPR (CONFIG_MBAR + 0x84d4) /* RX FIFO write pointer */ #define PACR (CONFIG_MBAR + 0xc00) /* PCI arbiter control */ -#define PASR (COFNIG_MBAR + 0xc04) /* PCI arbiter status */ +#define PASR (CONFIG_MBAR + 0xc04) /* PCI arbiter status */ /* * Definitions for the Global status and control register. -- cgit v1.2.3-70-g09d2