diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-06-02 12:58:10 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-06-02 12:58:10 +1000 |
| commit | eba6cdc936cb33d929997ccb9bade6f75bb40670 (patch) | |
| tree | 8fc95131e711155fe4e5613e5c0029cf71054e5e /linux-core/drmP.h | |
| parent | efb48c6cf7bbb57e7b2ea6ce7671905e84384963 (diff) | |
| parent | 7fec6c0e2a2457925b88ed3bd70d9defde77b81b (diff) | |
Merge branch 'modesetting-101-encoders' into modesetting-101
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 60ae018e..7c7e201a 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -743,7 +743,7 @@ struct drm_driver { struct drm_set_version *sv); /* FB routines, if present */ - int (*fb_probe)(struct drm_device *dev, struct drm_crtc *crtc, struct drm_output *output); + int (*fb_probe)(struct drm_device *dev, struct drm_crtc *crtc, struct drm_connector *connector); int (*fb_remove)(struct drm_device *dev, struct drm_framebuffer *fb); int (*fb_resize)(struct drm_device *dev, struct drm_crtc *crtc); @@ -1317,9 +1317,9 @@ extern void drm_sysfs_destroy(void); extern int drm_sysfs_device_add(struct drm_minor *minor); extern void drm_sysfs_hotplug_event(struct drm_device *dev); extern void drm_sysfs_device_remove(struct drm_minor *minor); -extern char *drm_get_output_status_name(enum drm_output_status status); -extern int drm_sysfs_output_add(struct drm_output *output); -extern void drm_sysfs_output_remove(struct drm_output *output); +extern char *drm_get_connector_status_name(enum drm_connector_status status); +extern int drm_sysfs_connector_add(struct drm_connector *connector); +extern void drm_sysfs_connector_remove(struct drm_connector *connector); /* * Basic memory manager support (drm_mm.c) |