diff options
Diffstat (limited to 'arch/microblaze/include/asm/prom.h')
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index 9977816c5ad3..2f03ac815851 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -11,19 +11,10 @@ | |||
11 | * as published by the Free Software Foundation; either version | 11 | * as published by the Free Software Foundation; either version |
12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
13 | */ | 13 | */ |
14 | |||
15 | #include <linux/of.h> /* linux/of.h gets to determine #include ordering */ | ||
16 | |||
17 | #ifndef _ASM_MICROBLAZE_PROM_H | 14 | #ifndef _ASM_MICROBLAZE_PROM_H |
18 | #define _ASM_MICROBLAZE_PROM_H | 15 | #define _ASM_MICROBLAZE_PROM_H |
19 | #ifdef __KERNEL__ | ||
20 | #ifndef __ASSEMBLY__ | ||
21 | |||
22 | #include <linux/types.h> | ||
23 | #include <asm/irq.h> | ||
24 | #include <linux/atomic.h> | ||
25 | 16 | ||
26 | #define HAVE_ARCH_DEVTREE_FIXUPS | 17 | #include <linux/of.h> |
27 | 18 | ||
28 | /* Other Prototypes */ | 19 | /* Other Prototypes */ |
29 | enum early_consoles { | 20 | enum early_consoles { |
@@ -33,32 +24,4 @@ enum early_consoles { | |||
33 | 24 | ||
34 | extern int of_early_console(void *version); | 25 | extern int of_early_console(void *version); |
35 | 26 | ||
36 | /* | ||
37 | * OF address retreival & translation | ||
38 | */ | ||
39 | |||
40 | #ifdef CONFIG_PCI | ||
41 | extern unsigned long pci_address_to_pio(phys_addr_t address); | ||
42 | #define pci_address_to_pio pci_address_to_pio | ||
43 | #endif /* CONFIG_PCI */ | ||
44 | |||
45 | /* Parse the ibm,dma-window property of an OF node into the busno, phys and | ||
46 | * size parameters. | ||
47 | */ | ||
48 | void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop, | ||
49 | unsigned long *busno, unsigned long *phys, unsigned long *size); | ||
50 | |||
51 | extern void kdump_move_device_tree(void); | ||
52 | |||
53 | #endif /* __ASSEMBLY__ */ | ||
54 | #endif /* __KERNEL__ */ | ||
55 | |||
56 | /* These includes are put at the bottom because they may contain things | ||
57 | * that are overridden by this file. Ideally they shouldn't be included | ||
58 | * by this file, but there are a bunch of .c files that currently depend | ||
59 | * on it. Eventually they will be cleaned up. */ | ||
60 | #include <linux/of_fdt.h> | ||
61 | #include <linux/of_irq.h> | ||
62 | #include <linux/platform_device.h> | ||
63 | |||
64 | #endif /* _ASM_MICROBLAZE_PROM_H */ | 27 | #endif /* _ASM_MICROBLAZE_PROM_H */ |