diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 19:10:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 19:10:47 +0100 |
| commit | b86b75ec57c381f32090a5bc61252f84f955c094 (patch) | |
| tree | 69afa8a88979bfa8fbdbcb106ddf8fe3ee5da99f /drivers/gpu/drm/armada/armada_drm.h | |
| parent | tty: an overflow of multiplication in drivers/tty/cyclades.c (diff) | |
| parent | Linux 3.13-rc5 (diff) | |
| download | linux-b86b75ec57c381f32090a5bc61252f84f955c094.tar.xz linux-b86b75ec57c381f32090a5bc61252f84f955c094.zip | |
Merge 3.13-rc5 into tty-next
We need the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_drm.h')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/armada/armada_drm.h b/drivers/gpu/drm/armada/armada_drm.h index eef09ec9a5ff..a72cae03b99b 100644 --- a/drivers/gpu/drm/armada/armada_drm.h +++ b/drivers/gpu/drm/armada/armada_drm.h @@ -103,6 +103,7 @@ void armada_drm_queue_unref_work(struct drm_device *, extern const struct drm_mode_config_funcs armada_drm_mode_config_funcs; int armada_fbdev_init(struct drm_device *); +void armada_fbdev_lastclose(struct drm_device *); void armada_fbdev_fini(struct drm_device *); int armada_overlay_plane_create(struct drm_device *, unsigned long); |