summaryrefslogtreecommitdiffstats
path: root/drivers/video/hpfb.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-29 17:18:49 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-29 17:18:49 -0500
commite02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch)
tree2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /drivers/video/hpfb.c
parent600511e86babe3727264a0883a3a264f6fb6caf5 (diff)
parentf3cab8a0b1a772dc8b055b7affa567a366627c9e (diff)
downloadop-kernel-dev-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.zip
op-kernel-dev-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.tar.gz
Merge branch 'master'
Diffstat (limited to 'drivers/video/hpfb.c')
-rw-r--r--drivers/video/hpfb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index bebdac5..abd920a 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -386,7 +386,9 @@ int __init hpfb_init(void)
if (fb_get_options("hpfb", NULL))
return -ENODEV;
- dio_module_init(&hpfb_driver);
+ err = dio_register_driver(&hpfb_driver);
+ if (err)
+ return err;
fs = get_fs();
set_fs(KERNEL_DS);
OpenPOWER on IntegriCloud