diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-03 14:03:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-03 14:03:07 +1000 |
| commit | 2d6a3334e62d820b63baa7dd3aa07b936e0660d8 (patch) | |
| tree | 9d442fde12cfa97585be286bfbf6f2b696a4b0d8 /drivers/video/cg6.c | |
| parent | 39249800cca4731f82671055c1553dd21df0943d (diff) | |
| parent | 12b15e83289bc7cf2ec9a342412e0c955beeb395 (diff) | |
Merge remote branch 'devicetree/next-devicetree'
Conflicts:
arch/microblaze/kernel/Makefile
Diffstat (limited to 'drivers/video/cg6.c')
| -rw-r--r-- | drivers/video/cg6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 480d761a27a8..2389a719dcc7 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c @@ -870,12 +870,12 @@ static int __init cg6_init(void) if (fb_get_options("cg6fb", NULL)) return -ENODEV; - return of_register_driver(&cg6_driver, &of_bus_type); + return of_register_platform_driver(&cg6_driver); } static void __exit cg6_exit(void) { - of_unregister_driver(&cg6_driver); + of_unregister_platform_driver(&cg6_driver); } module_init(cg6_init); |