git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
embedded6xx
/
ls_uart.c
diff --git
a/arch/powerpc/platforms/embedded6xx/ls_uart.c
b/arch/powerpc/platforms/embedded6xx/ls_uart.c
index
c99264c
..
9d891bd
100644
(file)
--- a/
arch/powerpc/platforms/embedded6xx/ls_uart.c
+++ b/
arch/powerpc/platforms/embedded6xx/ls_uart.c
@@
-117,9
+117,6
@@
static int __init ls_uarts_init(void)
phys_addr_t phys_addr;
int len;
phys_addr_t phys_addr;
int len;
- if (!machine_is(linkstation))
- return 0;
-
avr = of_find_node_by_path("/soc10x/serial@80004500");
if (!avr)
return -EINVAL;
avr = of_find_node_by_path("/soc10x/serial@80004500");
if (!avr)
return -EINVAL;
@@
-142,4
+139,4
@@
static int __init ls_uarts_init(void)
return 0;
}
return 0;
}
-
late_initcall(
ls_uarts_init);
+
machine_late_initcall(linkstation,
ls_uarts_init);