diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-02-19 13:35:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-02-19 13:35:18 +1000 |
| commit | 84266fcb3af6ba9e215adf0c482914963579639c (patch) | |
| tree | 830dac899929af5370fb5373154588f3687718b5 /drivers/gpu/drm/bochs/bochs_drv.c | |
| parent | f40ddce88593482919761f74910f42f4b84c004b (diff) | |
| parent | ac35d19fe871c81b9d78053d675095b597270304 (diff) | |
Merge branch 'drm-next' of git://anongit.freedesktop.org/git/drm/drmdrm-next-5.11-merged
Trial merge for Linus
Diffstat (limited to 'drivers/gpu/drm/bochs/bochs_drv.c')
| -rw-r--r-- | drivers/gpu/drm/bochs/bochs_drv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index fd454225fd19..b469624fe40d 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -121,7 +121,6 @@ static int bochs_pci_probe(struct pci_dev *pdev, if (ret) goto err_free_dev; - dev->pdev = pdev; pci_set_drvdata(pdev, dev); ret = bochs_load(dev); |