diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-04-18 11:55:09 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-04-18 11:55:09 +0100 |
| commit | ef2bce3a16428feb89f447e528bdea00c1066b8b (patch) | |
| tree | 7a7fcabf3a490200acd6da22c393df994bcbf9a3 /linux-core/drm_crtc.h | |
| parent | 51e867c57880c85c87e187af0a667e9b99413206 (diff) | |
| parent | 20b2949e3738bc900407d6aeddc6338f05b0b169 (diff) | |
Merge remote branch 'origin/modesetting-101' into modesetting-101
Diffstat (limited to 'linux-core/drm_crtc.h')
| -rw-r--r-- | linux-core/drm_crtc.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h index 584788ee..f8d7da26 100644 --- a/linux-core/drm_crtc.h +++ b/linux-core/drm_crtc.h @@ -418,7 +418,7 @@ struct drm_mode_config { /* DamagePtr rotationDamage? */ /* DGA stuff? */ struct drm_mode_config_funcs *funcs; - int fb_base; + unsigned long fb_base; }; struct drm_output *drm_output_create(struct drm_device *dev, @@ -453,8 +453,7 @@ extern int drm_mode_vrefresh(struct drm_display_mode *mode); extern void drm_mode_set_crtcinfo(struct drm_display_mode *p, int adjust_flags); extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev); -extern bool drm_initial_config(struct drm_device *dev, - struct drm_framebuffer *fb, bool cangrow); +extern bool drm_initial_config(struct drm_device *dev, bool cangrow); extern void drm_framebuffer_set_object(struct drm_device *dev, unsigned long handle); extern bool drm_set_desired_modes(struct drm_device *dev); |