diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-02-05 08:48:03 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-05 08:48:03 -0500 |
| commit | 2faea5274f079630991800bd579f85a621f96ef5 (patch) | |
| tree | 4afb9032f0ae3a3e8b539e0abe40cda320989ac3 /arch/s390/include/asm/io.h | |
| parent | 16c5ab1d3a6d1b11ed2966fa33a3a4fecd13a2bc (diff) | |
| parent | edac894389f9c9de2a1368c78809c824b343f3a5 (diff) | |
Merge branch 'for-linus' into for-next
Merge pending fixes that haven't pulled into 3.8.
Diffstat (limited to 'arch/s390/include/asm/io.h')
| -rw-r--r-- | arch/s390/include/asm/io.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h index 16c3eb164f4f..27cb32185ce1 100644 --- a/arch/s390/include/asm/io.h +++ b/arch/s390/include/asm/io.h | |||
| @@ -85,6 +85,11 @@ static inline void iounmap(volatile void __iomem *addr) | |||
| 85 | #define __raw_writel zpci_write_u32 | 85 | #define __raw_writel zpci_write_u32 |
| 86 | #define __raw_writeq zpci_write_u64 | 86 | #define __raw_writeq zpci_write_u64 |
| 87 | 87 | ||
| 88 | #define readb_relaxed readb | ||
| 89 | #define readw_relaxed readw | ||
| 90 | #define readl_relaxed readl | ||
| 91 | #define readq_relaxed readq | ||
| 92 | |||
| 88 | #endif /* CONFIG_PCI */ | 93 | #endif /* CONFIG_PCI */ |
| 89 | 94 | ||
| 90 | #include <asm-generic/io.h> | 95 | #include <asm-generic/io.h> |