diff options
Diffstat (limited to 'drivers/gpu/drm/mgag200')
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.h | 12 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_fb.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_i2c.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_main.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_mode.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index 7a05d6c129f0..1e910117b0a2 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c | |||
@@ -10,11 +10,11 @@ | |||
10 | */ | 10 | */ |
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/console.h> | 12 | #include <linux/console.h> |
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | 14 | ||
15 | #include "mgag200_drv.h" | 15 | #include "mgag200_drv.h" |
16 | 16 | ||
17 | #include "drm_pciids.h" | 17 | #include <drm/drm_pciids.h> |
18 | 18 | ||
19 | /* | 19 | /* |
20 | * This is the generic driver code. This binds the driver to the drm core, | 20 | * This is the generic driver code. This binds the driver to the drm core, |
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h index 6f13b3563234..73868d0c25ae 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h | |||
@@ -15,12 +15,12 @@ | |||
15 | 15 | ||
16 | #include <video/vga.h> | 16 | #include <video/vga.h> |
17 | 17 | ||
18 | #include "drm/drm_fb_helper.h" | 18 | #include <drm/drm_fb_helper.h> |
19 | #include "ttm/ttm_bo_api.h" | 19 | #include <drm/ttm/ttm_bo_api.h> |
20 | #include "ttm/ttm_bo_driver.h" | 20 | #include <drm/ttm/ttm_bo_driver.h> |
21 | #include "ttm/ttm_placement.h" | 21 | #include <drm/ttm/ttm_placement.h> |
22 | #include "ttm/ttm_memory.h" | 22 | #include <drm/ttm/ttm_memory.h> |
23 | #include "ttm/ttm_module.h" | 23 | #include <drm/ttm/ttm_module.h> |
24 | 24 | ||
25 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
26 | #include <linux/i2c-algo-bit.h> | 26 | #include <linux/i2c-algo-bit.h> |
diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c index 601517437380..2f486481d79a 100644 --- a/drivers/gpu/drm/mgag200/mgag200_fb.c +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c | |||
@@ -11,8 +11,8 @@ | |||
11 | * Dave Airlie | 11 | * Dave Airlie |
12 | */ | 12 | */ |
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include "drmP.h" | 14 | #include <drm/drmP.h> |
15 | #include "drm_fb_helper.h" | 15 | #include <drm/drm_fb_helper.h> |
16 | 16 | ||
17 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
18 | 18 | ||
diff --git a/drivers/gpu/drm/mgag200/mgag200_i2c.c b/drivers/gpu/drm/mgag200/mgag200_i2c.c index 946da5a05a30..5a88ec51b513 100644 --- a/drivers/gpu/drm/mgag200/mgag200_i2c.c +++ b/drivers/gpu/drm/mgag200/mgag200_i2c.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/export.h> | 28 | #include <linux/export.h> |
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/i2c-algo-bit.h> | 30 | #include <linux/i2c-algo-bit.h> |
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | 32 | ||
33 | #include "mgag200_drv.h" | 33 | #include "mgag200_drv.h" |
34 | 34 | ||
diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c index d65cb5e3ffa5..d6a1aae33701 100644 --- a/drivers/gpu/drm/mgag200/mgag200_main.c +++ b/drivers/gpu/drm/mgag200/mgag200_main.c | |||
@@ -10,8 +10,8 @@ | |||
10 | * Matt Turner | 10 | * Matt Turner |
11 | * Dave Airlie | 11 | * Dave Airlie |
12 | */ | 12 | */ |
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | #include "drm_crtc_helper.h" | 14 | #include <drm/drm_crtc_helper.h> |
15 | #include "mgag200_drv.h" | 15 | #include "mgag200_drv.h" |
16 | 16 | ||
17 | static void mga_user_framebuffer_destroy(struct drm_framebuffer *fb) | 17 | static void mga_user_framebuffer_destroy(struct drm_framebuffer *fb) |
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index 79078faeb3ee..3d429de0771a 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c | |||
@@ -13,8 +13,8 @@ | |||
13 | 13 | ||
14 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
15 | 15 | ||
16 | #include "drmP.h" | 16 | #include <drm/drmP.h> |
17 | #include "drm_crtc_helper.h" | 17 | #include <drm/drm_crtc_helper.h> |
18 | 18 | ||
19 | #include "mgag200_drv.h" | 19 | #include "mgag200_drv.h" |
20 | 20 | ||
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c index b223dcb7a710..1504699666c4 100644 --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c | |||
@@ -25,7 +25,7 @@ | |||
25 | /* | 25 | /* |
26 | * Authors: Dave Airlie <airlied@redhat.com> | 26 | * Authors: Dave Airlie <airlied@redhat.com> |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "mgag200_drv.h" | 29 | #include "mgag200_drv.h" |
30 | #include <ttm/ttm_page_alloc.h> | 30 | #include <ttm/ttm_page_alloc.h> |
31 | 31 | ||