diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 08:18:01 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 08:18:01 +0100 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/char/drm/mga_drv.c | |
| parent | drm: major update from CVS for radeon and core (diff) | |
| parent | Linux v2.6.15 (diff) | |
| download | linux-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.xz linux-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.zip | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/char/drm/mga_drv.c')
| -rw-r--r-- | drivers/char/drm/mga_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c index 93f171e634c0..9f7ed0e0351b 100644 --- a/drivers/char/drm/mga_drv.c +++ b/drivers/char/drm/mga_drv.c @@ -131,7 +131,7 @@ static int mga_driver_device_is_agp(drm_device_t * dev) * device. */ - if ((pdev->device == 0x0525) + if ((pdev->device == 0x0525) && pdev->bus->self && (pdev->bus->self->vendor == 0x3388) && (pdev->bus->self->device == 0x0021)) { return 0; |