diff --git a/[refs] b/[refs] index 9f780feca397..150d35f1fb8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7943b310001fd7858154bc3af2a78e0dd6bfea03 +refs/heads/master: 176ebf8736ee87e3bac4b4a8cbd95a5ca18dbec7 diff --git a/trunk/arch/powerpc/platforms/cell/celleb_scc_sio.c b/trunk/arch/powerpc/platforms/cell/celleb_scc_sio.c index 3a16c5b3c464..9c339ec646f5 100644 --- a/trunk/arch/powerpc/platforms/cell/celleb_scc_sio.c +++ b/trunk/arch/powerpc/platforms/cell/celleb_scc_sio.c @@ -42,14 +42,13 @@ static struct { static int __init txx9_serial_init(void) { extern int early_serial_txx9_setup(struct uart_port *port); - struct device_node *node = NULL; + struct device_node *node; int i; struct uart_port req; struct of_irq irq; struct resource res; - while ((node = of_find_compatible_node(node, - "serial", "toshiba,sio-scc")) != NULL) { + for_each_compatible_node(node, "serial", "toshiba,sio-scc") { for (i = 0; i < ARRAY_SIZE(txx9_scc_tab); i++) { if (!(txx9_serial_bitmap & (1<