diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-08-28 09:28:10 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-08-28 09:28:10 +0200 |
| commit | 4ddabd15620e6e4638a6a37a3a2b5bced626fcf9 (patch) | |
| tree | e0b6916c0d34c4cb7adbfa87c8438124a9acbba8 /linux-core/drm_stub.c | |
| parent | 886d3b3061cdf53f5a353cbaac843f63104d2658 (diff) | |
| parent | 9b984b34e99f694e10251e15bc2ec1bc844dcca4 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into drm-ttm-0-2-branch
Conflicts:
linux-core/drmP.h
Diffstat (limited to 'linux-core/drm_stub.c')
| -rw-r--r-- | linux-core/drm_stub.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c index 6182141a..16e50a55 100644 --- a/linux-core/drm_stub.c +++ b/linux-core/drm_stub.c @@ -69,23 +69,17 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev, #ifdef __alpha__ dev->hose = pdev->sysdata; - dev->pci_domain = dev->hose->bus->number; -#else - dev->pci_domain = 0; #endif - dev->pci_bus = pdev->bus->number; - dev->pci_slot = PCI_SLOT(pdev->devfn); - dev->pci_func = PCI_FUNC(pdev->devfn); dev->irq = pdev->irq; dev->maplist = drm_calloc(1, sizeof(*dev->maplist), DRM_MEM_MAPS); if (dev->maplist == NULL) return -ENOMEM; INIT_LIST_HEAD(&dev->maplist->head); - if (drm_ht_create(&dev->map_hash, 12)) { - drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS); - return -ENOMEM; - } + if (drm_ht_create(&dev->map_hash, 12)) { + drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS); + return -ENOMEM; + } if (drm_ht_create(&dev->object_hash, 12)) { drm_free(dev->maplist, sizeof(*dev->maplist), DRM_MEM_MAPS); |