diff options
| author | Dave Airlie | 2010-07-07 10:37:35 +0200 |
|---|---|---|
| committer | Dave Airlie | 2010-07-07 10:37:35 +0200 |
| commit | db8cc27b804f89e8fd5f9d5385161956a777c471 (patch) | |
| tree | 4d84e12dbf9b4bd75fa6150f4aedf54a41d722db /drivers/gpu/drm/radeon/radeon_bios.c | |
| parent | Merge tag 'v2.6.35-rc4' into drm-testing (diff) | |
| parent | drm: Make sure the DRM offset matches the CPU (diff) | |
| download | kernel-qcow2-linux-db8cc27b804f89e8fd5f9d5385161956a777c471.tar.gz kernel-qcow2-linux-db8cc27b804f89e8fd5f9d5385161956a777c471.tar.xz kernel-qcow2-linux-db8cc27b804f89e8fd5f9d5385161956a777c471.zip | |
Merge branch 'drm-platform' into drm-testing
* drm-platform:
drm: Make sure the DRM offset matches the CPU
drm: Add __arm defines to DRM
drm: Add support for platform devices to register as DRM devices
drm: Remove drm_resource wrappers
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_bios.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_bios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c index 2c9213739999..654787ec43f4 100644 --- a/drivers/gpu/drm/radeon/radeon_bios.c +++ b/drivers/gpu/drm/radeon/radeon_bios.c @@ -53,7 +53,7 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev) return false; rdev->bios = NULL; - vram_base = drm_get_resource_start(rdev->ddev, 0); + vram_base = pci_resource_start(rdev->pdev, 0); bios = ioremap(vram_base, size); if (!bios) { return false; |