diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/sbus/char/jsflash.c | 2 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index 4942050dc5b6..513937160afd 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c | |||
@@ -459,7 +459,7 @@ static int jsflash_init(void) | |||
459 | { | 459 | { |
460 | int rc; | 460 | int rc; |
461 | struct jsflash *jsf; | 461 | struct jsflash *jsf; |
462 | int node; | 462 | phandle node; |
463 | char banner[128]; | 463 | char banner[128]; |
464 | struct linux_prom_registers reg0; | 464 | struct linux_prom_registers reg0; |
465 | 465 | ||
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index f8d69ad36830..5bf91236c701 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -2970,7 +2970,8 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev, | |||
2970 | struct atyfb_par *par = info->par; | 2970 | struct atyfb_par *par = info->par; |
2971 | struct device_node *dp; | 2971 | struct device_node *dp; |
2972 | char prop[128]; | 2972 | char prop[128]; |
2973 | int node, len, i, j, ret; | 2973 | phandle node; |
2974 | int len, i, j, ret; | ||
2974 | u32 mem, chip_id; | 2975 | u32 mem, chip_id; |
2975 | 2976 | ||
2976 | /* | 2977 | /* |