diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/char/drm/mga_drv.c | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
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) | |||
| 131 | * device. | 131 | * device. |
| 132 | */ | 132 | */ |
| 133 | 133 | ||
| 134 | if ((pdev->device == 0x0525) | 134 | if ((pdev->device == 0x0525) && pdev->bus->self |
| 135 | && (pdev->bus->self->vendor == 0x3388) | 135 | && (pdev->bus->self->vendor == 0x3388) |
| 136 | && (pdev->bus->self->device == 0x0021)) { | 136 | && (pdev->bus->self->device == 0x0021)) { |
| 137 | return 0; | 137 | return 0; |