diff --git a/[refs] b/[refs] index 6e836d4b127f..7a5e9ab0b144 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f81a18446c3061b74f4770eb95adeba2a864b0f +refs/heads/master: 779b7e64b536ff65bcd40c0292871d2bb9b6d6e5 diff --git a/trunk/arch/m68k/include/asm/io_mm.h b/trunk/arch/m68k/include/asm/io_mm.h index 125cb60a2df9..0fb3468000e7 100644 --- a/trunk/arch/m68k/include/asm/io_mm.h +++ b/trunk/arch/m68k/include/asm/io_mm.h @@ -250,9 +250,13 @@ static inline void isa_delay(void) #define outb(val,port) ((void)0) #define outb_p(val,port) ((void)0) #define inw(port) 0xffff +#define inw_p(port) 0xffff #define outw(val,port) ((void)0) +#define outw_p(val,port) ((void)0) #define inl(port) 0xffffffffUL +#define inl_p(port) 0xffffffffUL #define outl(val,port) ((void)0) +#define outl_p(val,port) ((void)0) #define insb(port,buf,nr) ((void)0) #define outsb(port,buf,nr) ((void)0)