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

[pandora-kernel.git] / drivers / sbus / char / jsflash.c

diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 13f48e2..a624f5a 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;