diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
commit | 3e370b29d35fb01bfb92c2814d6f79bf6a2cb970 (patch) | |
tree | 3b8fb467d60bfe6a34686f4abdc3a60050ba40a4 /include/asm-ppc/zorro.h | |
parent | 88d1dce3a74367291f65a757fbdcaf17f042f30c (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
drivers/pci/quirks.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-ppc/zorro.h')
-rw-r--r-- | include/asm-ppc/zorro.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/include/asm-ppc/zorro.h b/include/asm-ppc/zorro.h deleted file mode 100644 index 1e5fbc65e77b..000000000000 --- a/include/asm-ppc/zorro.h +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | #ifndef _ASM_PPC_ZORRO_H | ||
2 | #define _ASM_PPC_ZORRO_H | ||
3 | |||
4 | #include <asm/io.h> | ||
5 | |||
6 | #define z_readb in_8 | ||
7 | #define z_readw in_be16 | ||
8 | #define z_readl in_be32 | ||
9 | |||
10 | #define z_writeb(val, port) out_8((port), (val)) | ||
11 | #define z_writew(val, port) out_be16((port), (val)) | ||
12 | #define z_writel(val, port) out_be32((port), (val)) | ||
13 | |||
14 | #define z_memset_io(a,b,c) memset((void *)(a),(b),(c)) | ||
15 | #define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) | ||
16 | #define z_memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) | ||
17 | |||
18 | extern void *__ioremap(unsigned long address, unsigned long size, | ||
19 | unsigned long flags); | ||
20 | |||
21 | extern void *ioremap(unsigned long address, unsigned long size); | ||
22 | extern void iounmap(void *addr); | ||
23 | |||
24 | extern void *__ioremap(unsigned long address, unsigned long size, | ||
25 | unsigned long flags); | ||
26 | |||
27 | #define z_ioremap ioremap | ||
28 | #define z_iounmap iounmap | ||
29 | |||
30 | #endif /* _ASM_PPC_ZORRO_H */ | ||