diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-03-07 12:25:26 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-03-07 12:25:26 +1100 |
| commit | 348d95e00be73b650dabcf121e6b18d669bf4192 (patch) | |
| tree | e9be3093af7f9c2c9c172e175446ac20d4bb5610 /linux-core | |
| parent | 47b7ec71fefc2574293c48172c563f549c31f87a (diff) | |
worst merge effort ever
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drm_stub.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c index ba13e5e5..6856075b 100644 --- a/linux-core/drm_stub.c +++ b/linux-core/drm_stub.c @@ -355,10 +355,6 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, if ((ret = dev->driver->load(dev, ent->driver_data))) goto err_g5; - if (dev->driver->load) - if ((ret = dev->driver->load(dev, ent->driver_data))) - goto err_g4; - DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n", driver->name, driver->major, driver->minor, driver->patchlevel, driver->date, dev->primary->index); |