diff options
author | Ingo Molnar | 2010-11-18 13:22:14 +0100 |
---|---|---|
committer | Ingo Molnar | 2010-11-18 13:22:26 +0100 |
commit | 92fd4d4d67b945c0766416284d4ab236b31542c4 (patch) | |
tree | 00b8b5f90748f752ccaba3dddbe271091d93543a /drivers/gpu/drm/mga/mga_drv.c | |
parent | sched: Make sched_param argument static in sched_setscheduler() callers (diff) | |
parent | Linux 2.6.37-rc2 (diff) | |
download | kernel-qcow2-linux-92fd4d4d67b945c0766416284d4ab236b31542c4.tar.gz kernel-qcow2-linux-92fd4d4d67b945c0766416284d4ab236b31542c4.tar.xz kernel-qcow2-linux-92fd4d4d67b945c0766416284d4ab236b31542c4.zip |
Merge commit 'v2.6.37-rc2' into sched/core
Merge reason: Move to a .37-rc base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/gpu/drm/mga/mga_drv.c')
-rw-r--r-- | drivers/gpu/drm/mga/mga_drv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c index 26d0d8ced80d..0aaf5f67a436 100644 --- a/drivers/gpu/drm/mga/mga_drv.c +++ b/drivers/gpu/drm/mga/mga_drv.c @@ -60,8 +60,6 @@ static struct drm_driver driver = { .irq_uninstall = mga_driver_irq_uninstall, .irq_handler = mga_driver_irq_handler, .reclaim_buffers = drm_core_reclaim_buffers, - .get_map_ofs = drm_core_get_map_ofs, - .get_reg_ofs = drm_core_get_reg_ofs, .ioctls = mga_ioctls, .dma_ioctl = mga_dma_buffers, .fops = { @@ -75,6 +73,7 @@ static struct drm_driver driver = { #ifdef CONFIG_COMPAT .compat_ioctl = mga_compat_ioctl, #endif + .llseek = noop_llseek, }, .pci_driver = { .name = DRIVER_NAME, |