Commit 68394bfb authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

Pull SuperH fixes from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
  SH: Convert out[bwl] macros to inline functions
  sh: Fix up se7721 GPIOLIB=y build warnings.
parents e7654c1e 44033109
...@@ -19,9 +19,20 @@ static inline u32 inl(unsigned long addr) ...@@ -19,9 +19,20 @@ static inline u32 inl(unsigned long addr)
return -1; return -1;
} }
#define outb(x, y) BUG() static inline void outb(unsigned char x, unsigned long port)
#define outw(x, y) BUG() {
#define outl(x, y) BUG() BUG();
}
static inline void outw(unsigned short x, unsigned long port)
{
BUG();
}
static inline void outl(unsigned int x, unsigned long port)
{
BUG();
}
#define inb_p(addr) inb(addr) #define inb_p(addr) inb(addr)
#define inw_p(addr) inw(addr) #define inw_p(addr) inw(addr)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/io.h> #include <linux/io.h>
#include <cpu/serial.h> #include <cpu/serial.h>
#include <asm/gpio.h> #include <cpu/gpio.h>
static void sh7720_sci_init_pins(struct uart_port *port, unsigned int cflag) static void sh7720_sci_init_pins(struct uart_port *port, unsigned int cflag)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment