1
0
Fork 0

SuperH fixes for 3.5-rc7

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAk/+UOUACgkQGkmNcg7/o7jyxgCgvK4vAsdItlh2q/Hr6Du/JqNA
 Yw8AoNidLKlt0KwTxPu2CwtECU584kv1
 =+Rii
 -----END PGP SIGNATURE-----

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.
wifi-calibration
Linus Torvalds 2012-07-13 09:04:00 -07:00
commit 68394bfbe5
2 changed files with 15 additions and 4 deletions

View File

@ -19,9 +19,20 @@ static inline u32 inl(unsigned long addr)
return -1;
}
#define outb(x, y) BUG()
#define outw(x, y) BUG()
#define outl(x, y) BUG()
static inline void outb(unsigned char x, unsigned long port)
{
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 inw_p(addr) inw(addr)

View File

@ -2,7 +2,7 @@
#include <linux/serial_core.h>
#include <linux/io.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)
{