Merge commit 'v3.7-rc1' into stable/for-linus-3.7

[~andy/linux] / drivers / gpu / drm / mga / mga_warp.c

diff --git a/drivers/gpu/drm/mga/mga_warp.c b/drivers/gpu/drm/mga/mga_warp.c
index 722a91b69b0cc55d0ac4658de03e67f912d4d2d4..0b76352260a9fbef3c7a4115299ca130a86b22e1 100644 (file)
--- a/drivers/gpu/drm/mga/mga_warp.c
+++ b/drivers/gpu/drm/mga/mga_warp.c
@@ -32,9 +32,8 @@
 #include <linux/platform_device.h>
 #include <linux/module.h>
 
-#include "drmP.h"
-#include "drm.h"
-#include "mga_drm.h"
+#include <drm/drmP.h>
+#include <drm/mga_drm.h>
 #include "mga_drv.h"
 
 #define FIRMWARE_G200 "matrox/g200_warp.fw"