vserver 2.0 rc7

[linux-2.6.git] / drivers / char / drm / i810_drv.c

diff --git a/drivers/char/drm/i810_drv.c b/drivers/char/drm/i810_drv.c
index 2929ad2..ff51b32 100644 (file)
--- a/drivers/char/drm/i810_drv.c
+++ b/drivers/char/drm/i810_drv.c
@@ -53,7 +53,7 @@ static int postinit( struct drm_device *dev, unsigned long flags )
                DRIVER_MINOR,
                DRIVER_PATCHLEVEL,
                DRIVER_DATE,
-               dev->minor,
+               dev->primary.minor,
                pci_pretty_name(dev->pdev)
                );
        return 0;
@@ -83,6 +83,7 @@ static struct drm_driver driver = {
        .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_DMA | DRIVER_DMA_QUEUE,
        .dev_priv_size = sizeof(drm_i810_buf_priv_t),
        .pretakedown = i810_driver_pretakedown,
+       .prerelease = i810_driver_prerelease,
        .release = i810_driver_release,
        .dma_quiescent = i810_driver_dma_quiescent,
        .reclaim_buffers = i810_reclaim_buffers,