drm/nouveau: merge nouveau_platform.ko into nouveau.ko
authorAlexandre Courbot <acourbot@nvidia.com>
Thu, 15 Jan 2015 06:29:56 +0000 (15:29 +0900)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 22 Jan 2015 02:15:09 +0000 (12:15 +1000)
Having the two modules separated causes various unneeded complications,
including having to export symbols accessed between the modules. Make
things simpler by compiling platform device support into nouveau.ko.
Platform device support remains optional and is only compiled on Tegra.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Reviewed-by: Vince Hsu <vinceh@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/Kconfig
drivers/gpu/drm/nouveau/Makefile
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/nouveau/nouveau_platform.c
drivers/gpu/drm/nouveau/nouveau_platform.h

Simple merge
Simple merge
Simple merge