drm: merge drm_drv.c into drm_ioctl.c
authorDavid Herrmann <dh.herrmann@gmail.com>
Wed, 23 Jul 2014 12:14:53 +0000 (14:14 +0200)
committerDavid Herrmann <dh.herrmann@gmail.com>
Tue, 5 Aug 2014 14:08:11 +0000 (16:08 +0200)
commitec8f112db2ee0032f2b047109fdbd87f1c264ad8
treec7579f0f70f89dd53e87400bd8a8ffc04abb337d
parent1b7199fe9840737397d335922033aa2c3cca92c6
drm: merge drm_drv.c into drm_ioctl.c

All that is left in drm_drv.c is ioctl management. Merge it into
drm_ioctl.c so we have all ioctl management in one file (and the name is
much more fitting).

Maybe we should now rename drm_stub.c to drm_drv.c again?

Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
drivers/gpu/drm/Makefile
drivers/gpu/drm/drm_drv.c [deleted file]
drivers/gpu/drm/drm_ioctl.c