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/agp/sis-agp.c | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/char/agp/sis-agp.c')
| -rw-r--r-- | drivers/char/agp/sis-agp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c index a701361a8890..ebc05554045c 100644 --- a/drivers/char/agp/sis-agp.c +++ b/drivers/char/agp/sis-agp.c | |||
| @@ -332,7 +332,6 @@ static struct pci_device_id agp_sis_pci_table[] = { | |||
| 332 | MODULE_DEVICE_TABLE(pci, agp_sis_pci_table); | 332 | MODULE_DEVICE_TABLE(pci, agp_sis_pci_table); |
| 333 | 333 | ||
| 334 | static struct pci_driver agp_sis_pci_driver = { | 334 | static struct pci_driver agp_sis_pci_driver = { |
| 335 | .owner = THIS_MODULE, | ||
| 336 | .name = "agpgart-sis", | 335 | .name = "agpgart-sis", |
| 337 | .id_table = agp_sis_pci_table, | 336 | .id_table = agp_sis_pci_table, |
| 338 | .probe = agp_sis_probe, | 337 | .probe = agp_sis_probe, |