diff options
Diffstat (limited to 'arch/sparc/include/asm/prom.h')
-rw-r--r-- | arch/sparc/include/asm/prom.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h index 82a190d7efc1..0733170e02ca 100644 --- a/arch/sparc/include/asm/prom.h +++ b/arch/sparc/include/asm/prom.h | |||
@@ -1,3 +1,4 @@ | |||
1 | #include <linux/of.h> /* linux/of.h gets to determine #include ordering */ | ||
1 | #ifndef _SPARC_PROM_H | 2 | #ifndef _SPARC_PROM_H |
2 | #define _SPARC_PROM_H | 3 | #define _SPARC_PROM_H |
3 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
@@ -108,12 +109,6 @@ static inline void irq_dispose_mapping(unsigned int virq) | |||
108 | { | 109 | { |
109 | } | 110 | } |
110 | 111 | ||
111 | /* | ||
112 | * NB: This is here while we transition from using asm/prom.h | ||
113 | * to linux/of.h | ||
114 | */ | ||
115 | #include <linux/of.h> | ||
116 | |||
117 | extern struct device_node *of_console_device; | 112 | extern struct device_node *of_console_device; |
118 | extern char *of_console_path; | 113 | extern char *of_console_path; |
119 | extern char *of_console_options; | 114 | extern char *of_console_options; |