diff options
Diffstat (limited to 'drivers/video/acornfb.c')
-rw-r--r-- | drivers/video/acornfb.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index 193b482570c7..750cebb18306 100644 --- a/drivers/video/acornfb.c +++ b/drivers/video/acornfb.c | |||
@@ -1279,7 +1279,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end) | |||
1279 | printk("acornfb: freed %dK memory\n", mb_freed); | 1279 | printk("acornfb: freed %dK memory\n", mb_freed); |
1280 | } | 1280 | } |
1281 | 1281 | ||
1282 | static int __init acornfb_probe(struct device *dev) | 1282 | static int __init acornfb_probe(struct platform_device *dev) |
1283 | { | 1283 | { |
1284 | unsigned long size; | 1284 | unsigned long size; |
1285 | u_int h_sync, v_sync; | 1285 | u_int h_sync, v_sync; |
@@ -1292,7 +1292,7 @@ static int __init acornfb_probe(struct device *dev) | |||
1292 | 1292 | ||
1293 | acornfb_init_fbinfo(); | 1293 | acornfb_init_fbinfo(); |
1294 | 1294 | ||
1295 | current_par.dev = dev; | 1295 | current_par.dev = &dev->dev; |
1296 | 1296 | ||
1297 | if (current_par.montype == -1) | 1297 | if (current_par.montype == -1) |
1298 | current_par.montype = acornfb_detect_monitortype(); | 1298 | current_par.montype = acornfb_detect_monitortype(); |
@@ -1453,15 +1453,16 @@ static int __init acornfb_probe(struct device *dev) | |||
1453 | return 0; | 1453 | return 0; |
1454 | } | 1454 | } |
1455 | 1455 | ||
1456 | static struct device_driver acornfb_driver = { | 1456 | static struct platform_driver acornfb_driver = { |
1457 | .name = "acornfb", | ||
1458 | .bus = &platform_bus_type, | ||
1459 | .probe = acornfb_probe, | 1457 | .probe = acornfb_probe, |
1458 | .driver = { | ||
1459 | .name = "acornfb", | ||
1460 | }, | ||
1460 | }; | 1461 | }; |
1461 | 1462 | ||
1462 | static int __init acornfb_init(void) | 1463 | static int __init acornfb_init(void) |
1463 | { | 1464 | { |
1464 | return driver_register(&acornfb_driver); | 1465 | return platform_driver_register(&acornfb_driver); |
1465 | } | 1466 | } |
1466 | 1467 | ||
1467 | module_init(acornfb_init); | 1468 | module_init(acornfb_init); |