diff options
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index 37e6f305a68e..66368896f922 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -12,6 +12,8 @@ | |||
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 | 14 | ||
15 | #include <linux/of.h> /* linux/of.h gets to determine #include ordering */ | ||
16 | |||
15 | #ifndef _ASM_MICROBLAZE_PROM_H | 17 | #ifndef _ASM_MICROBLAZE_PROM_H |
16 | #define _ASM_MICROBLAZE_PROM_H | 18 | #define _ASM_MICROBLAZE_PROM_H |
17 | #ifdef __KERNEL__ | 19 | #ifdef __KERNEL__ |
@@ -305,12 +307,6 @@ extern int of_irq_to_resource(struct device_node *dev, int index, | |||
305 | */ | 307 | */ |
306 | extern void __iomem *of_iomap(struct device_node *device, int index); | 308 | extern void __iomem *of_iomap(struct device_node *device, int index); |
307 | 309 | ||
308 | /* | ||
309 | * NB: This is here while we transition from using asm/prom.h | ||
310 | * to linux/of.h | ||
311 | */ | ||
312 | #include <linux/of.h> | ||
313 | |||
314 | #endif /* __ASSEMBLY__ */ | 310 | #endif /* __ASSEMBLY__ */ |
315 | #endif /* __KERNEL__ */ | 311 | #endif /* __KERNEL__ */ |
316 | #endif /* _ASM_MICROBLAZE_PROM_H */ | 312 | #endif /* _ASM_MICROBLAZE_PROM_H */ |