diff options
| author | Kristoffer Ericson <kristoffer.ericson@gmail.com> | 2011-03-05 23:09:57 +0100 |
|---|---|---|
| committer | Kristoffer Ericson <kristoffer.ericson@gmail.com> | 2011-03-05 23:09:57 +0100 |
| commit | 42d7c8dc887a2cece61747ec57856e83bc5015aa (patch) | |
| tree | 05f099dde978e531faa8fdbfff54c0ae4652d0c8 | |
| parent | ae9dfa43e462988d37c3daf04321de81e6ea89e8 (diff) | |
| download | linux-hpc-v2.6.37-hpc.tar.gz | |
This patch fixes some compilation issues, due to lock/unlock_consolev2.6.37-hpc
not being implemented yet (and not worth the hassle to fix) and also
reverting the drm_pci_init/drm_pci_exit.
Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
| -rw-r--r-- | drivers/staging/gma500/psb_drv.c | 4 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_fb.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c index caa5140a6002b..a5be78fd61068 100644 --- a/drivers/staging/gma500/psb_drv.c +++ b/drivers/staging/gma500/psb_drv.c @@ -1662,12 +1662,12 @@ static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int __init psb_init(void) { - return drm_pci_init(&driver, &psb_pci_driver); + return drm_init(&driver); } static void __exit psb_exit(void) { - drm_pci_exit(&driver, &psb_pci_driver); + drm_exit(&driver); } late_initcall(psb_init); diff --git a/drivers/staging/gma500/psb_fb.c b/drivers/staging/gma500/psb_fb.c index 6585e88822437..b9de5caf58212 100644 --- a/drivers/staging/gma500/psb_fb.c +++ b/drivers/staging/gma500/psb_fb.c @@ -126,9 +126,9 @@ int psbfb_kms_off_ioctl(struct drm_device *dev, void *data, if (drm_psb_no_fb) return 0; - console_lock(); + acquire_console_sem(); ret = psbfb_kms_off(dev, 0); - console_unlock(); + release_console_sem(); return ret; } @@ -161,25 +161,25 @@ int psbfb_kms_on_ioctl(struct drm_device *dev, void *data, if (drm_psb_no_fb) return 0; - console_lock(); + acquire_console_sem(); ret = psbfb_kms_on(dev, 0); - console_unlock(); + release_console_sem(); drm_helper_disable_unused_functions(dev); return ret; } void psbfb_suspend(struct drm_device *dev) { - console_lock(); + acquire_console_sem(); psbfb_kms_off(dev, 1); - console_unlock(); + release_console_sem(); } void psbfb_resume(struct drm_device *dev) { - console_lock(); + acquire_console_sem(); psbfb_kms_on(dev, 1); - console_unlock(); + release_console_sem(); drm_helper_disable_unused_functions(dev); } |