diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-21 14:20:37 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-21 14:20:37 +0000 |
commit | 0340ff10910d1daf161dc81ba6ffc85e47faa09b (patch) | |
tree | 6dfac79e184d221cd925de4703d55d99bc3a8d6d /arch/m68k/include/asm/sbus.h | |
parent | 6484c6ca6b91d1e2b107d296e7306de3f6e422b2 (diff) | |
parent | 74c41fb6f52268470b4552ca543515be210c71fb (diff) |
Merge branch 'testing/defconfig-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into testing/multiplatformtracking-multiplatform-llct-20120821.0
Conflicts:
arch/arm/mach-pxa/cm-x2xx.c
sound/soc/ux500/ux500_msp_dai.c
sound/soc/ux500/ux500_msp_i2s.c
sound/soc/ux500/ux500_msp_i2s.h
Diffstat (limited to 'arch/m68k/include/asm/sbus.h')
-rw-r--r-- | arch/m68k/include/asm/sbus.h | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/arch/m68k/include/asm/sbus.h b/arch/m68k/include/asm/sbus.h deleted file mode 100644 index bfe3ba147f2e..000000000000 --- a/arch/m68k/include/asm/sbus.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * some sbus structures and macros to make usage of sbus drivers possible - */ - -#ifndef __M68K_SBUS_H -#define __M68K_SBUS_H - -struct sbus_dev { - struct { - unsigned int which_io; - unsigned int phys_addr; - } reg_addrs[1]; -}; - -/* sbus IO functions stolen from include/asm-sparc/io.h for the serial driver */ -/* No SBUS on the Sun3, kludge -- sam */ - -static inline void _sbus_writeb(unsigned char val, unsigned long addr) -{ - *(volatile unsigned char *)addr = val; -} - -static inline unsigned char _sbus_readb(unsigned long addr) -{ - return *(volatile unsigned char *)addr; -} - -static inline void _sbus_writel(unsigned long val, unsigned long addr) -{ - *(volatile unsigned long *)addr = val; - -} - -extern inline unsigned long _sbus_readl(unsigned long addr) -{ - return *(volatile unsigned long *)addr; -} - - -#define sbus_readb(a) _sbus_readb((unsigned long)a) -#define sbus_writeb(v, a) _sbus_writeb(v, (unsigned long)a) -#define sbus_readl(a) _sbus_readl((unsigned long)a) -#define sbus_writel(v, a) _sbus_writel(v, (unsigned long)a) - -#endif |