diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-07 13:36:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-07 13:36:00 +1000 |
| commit | 90520b78a4f8ba1faef75961eddd8192077e0ac2 (patch) | |
| tree | 4179071189852a622d4a9e615a004388474069b5 /include/drm | |
| parent | d94a5108f716bbd524358eb5a440d63991744a62 (diff) | |
| parent | e89a8c901ca94a47c0e0b2fb335623d810e37545 (diff) | |
Merge branch 'drm-core-next' into drm-linus
* drm-core-next:
drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
drm/edid: Fix CVT width/height decode
drm/edid: Skip empty CVT codepoints
drm: remove address mask param for drm_pci_alloc()
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 71dafb69cfe..ffac157fb5b 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1408,7 +1408,7 @@ extern int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info * gart_info); extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, - size_t align, dma_addr_t maxaddr); + size_t align); extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); |