diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-01 01:20:30 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-08-03 22:02:00 -0400 |
commit | b8b572e1015f81b4e748417be2629dfe51ab99f9 (patch) | |
tree | 7df58667d5ed71d6c8f8f4ce40ca16b6fb776d0b /include/asm-powerpc/ide.h | |
parent | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (diff) |
powerpc: Move include files to arch/powerpc/include/asm
from include/asm-powerpc. This is the result of a
mkdir arch/powerpc/include/asm
git mv include/asm-powerpc/* arch/powerpc/include/asm
Followed by a few documentation/comment fixups and a couple of places
where <asm-powepc/...> was being used explicitly. Of the latter only
one was outside the arch code and it is a driver only built for powerpc.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/ide.h')
-rw-r--r-- | include/asm-powerpc/ide.h | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h deleted file mode 100644 index 1aaf27be8741..000000000000 --- a/include/asm-powerpc/ide.h +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 1994-1996 Linus Torvalds & authors | ||
3 | * | ||
4 | * This file contains the powerpc architecture specific IDE code. | ||
5 | */ | ||
6 | #ifndef _ASM_POWERPC_IDE_H | ||
7 | #define _ASM_POWERPC_IDE_H | ||
8 | |||
9 | #ifdef __KERNEL__ | ||
10 | |||
11 | #ifndef __powerpc64__ | ||
12 | #include <linux/sched.h> | ||
13 | #include <asm/mpc8xx.h> | ||
14 | #endif | ||
15 | #include <asm/io.h> | ||
16 | |||
17 | #define __ide_mm_insw(p, a, c) readsw((void __iomem *)(p), (a), (c)) | ||
18 | #define __ide_mm_insl(p, a, c) readsl((void __iomem *)(p), (a), (c)) | ||
19 | #define __ide_mm_outsw(p, a, c) writesw((void __iomem *)(p), (a), (c)) | ||
20 | #define __ide_mm_outsl(p, a, c) writesl((void __iomem *)(p), (a), (c)) | ||
21 | |||
22 | #ifndef __powerpc64__ | ||
23 | #include <linux/hdreg.h> | ||
24 | #include <linux/ioport.h> | ||
25 | |||
26 | /* FIXME: use ide_platform host driver */ | ||
27 | static __inline__ int ide_default_irq(unsigned long base) | ||
28 | { | ||
29 | #ifdef CONFIG_PPLUS | ||
30 | switch (base) { | ||
31 | case 0x1f0: return 14; | ||
32 | case 0x170: return 15; | ||
33 | } | ||
34 | #endif | ||
35 | return 0; | ||
36 | } | ||
37 | |||
38 | /* FIXME: use ide_platform host driver */ | ||
39 | static __inline__ unsigned long ide_default_io_base(int index) | ||
40 | { | ||
41 | #ifdef CONFIG_PPLUS | ||
42 | switch (index) { | ||
43 | case 0: return 0x1f0; | ||
44 | case 1: return 0x170; | ||
45 | } | ||
46 | #endif | ||
47 | return 0; | ||
48 | } | ||
49 | |||
50 | #ifdef CONFIG_BLK_DEV_MPC8xx_IDE | ||
51 | #define IDE_ARCH_ACK_INTR 1 | ||
52 | #define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1) | ||
53 | #endif | ||
54 | |||
55 | #endif /* __powerpc64__ */ | ||
56 | |||
57 | #endif /* __KERNEL__ */ | ||
58 | |||
59 | #endif /* _ASM_POWERPC_IDE_H */ | ||