Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

[net-next-2.6.git] / drivers / sbus / char / jsflash.c

diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 13f48e28a1e1f3b8e4c80c73d9cfecb9eb50c077..a624f5af4320d4b5e7158d2be4032d1501eb5336 100644 (file)
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -461,7 +461,7 @@ static int jsflash_init(void)
 {
        int rc;
        struct jsflash *jsf;
-       int node;
+       phandle node;
        char banner[128];
        struct linux_prom_registers reg0;