Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 348528
b: refs/heads/master
c: 478740a
h: refs/heads/master
v: v3
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Jan 8, 2013
1 parent d5488ca commit e9380f2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 80020fbd65c17d3d9e7d80cfd3fa4c57ae7ff765
refs/heads/master: 478740a14826c50595649b3dafed71576796dd95
5 changes: 5 additions & 0 deletions trunk/arch/s390/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ static inline void iounmap(volatile void __iomem *addr)
#define __raw_writel zpci_write_u32
#define __raw_writeq zpci_write_u64

#define readb_relaxed readb
#define readw_relaxed readw
#define readl_relaxed readl
#define readq_relaxed readq

#endif /* CONFIG_PCI */

#include <asm-generic/io.h>
Expand Down

0 comments on commit e9380f2

Please sign in to comment.