diff options
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx/holly.c')
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/holly.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c index 8c305c7c8977..dafba1057a47 100644 --- a/arch/powerpc/platforms/embedded6xx/holly.c +++ b/arch/powerpc/platforms/embedded6xx/holly.c | |||
@@ -193,7 +193,7 @@ void holly_show_cpuinfo(struct seq_file *m) | |||
193 | seq_printf(m, "machine\t\t: PPC750 GX/CL\n"); | 193 | seq_printf(m, "machine\t\t: PPC750 GX/CL\n"); |
194 | } | 194 | } |
195 | 195 | ||
196 | void holly_restart(char *cmd) | 196 | void __noreturn holly_restart(char *cmd) |
197 | { | 197 | { |
198 | __be32 __iomem *ocn_bar1 = NULL; | 198 | __be32 __iomem *ocn_bar1 = NULL; |
199 | unsigned long bar; | 199 | unsigned long bar; |
@@ -250,9 +250,7 @@ void holly_halt(void) | |||
250 | */ | 250 | */ |
251 | static int __init holly_probe(void) | 251 | static int __init holly_probe(void) |
252 | { | 252 | { |
253 | unsigned long root = of_get_flat_dt_root(); | 253 | if (!of_machine_is_compatible("ibm,holly")) |
254 | |||
255 | if (!of_flat_dt_is_compatible(root, "ibm,holly")) | ||
256 | return 0; | 254 | return 0; |
257 | return 1; | 255 | return 1; |
258 | } | 256 | } |