diff options
Diffstat (limited to 'drivers/gpu/drm/udl')
-rw-r--r-- | drivers/gpu/drm/udl/udl_connector.c | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_drv.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_encoder.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_fb.c | 9 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_gem.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_main.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_modeset.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_transfer.c | 2 |
8 files changed, 19 insertions, 20 deletions
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c index 8d9dc44f1f94..627cd85521b1 100644 --- a/drivers/gpu/drm/udl/udl_connector.c +++ b/drivers/gpu/drm/udl/udl_connector.c | |||
@@ -10,10 +10,10 @@ | |||
10 | * more details. | 10 | * more details. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | #include "drm_crtc.h" | 14 | #include <drm/drm_crtc.h> |
15 | #include "drm_edid.h" | 15 | #include <drm/drm_edid.h> |
16 | #include "drm_crtc_helper.h" | 16 | #include <drm/drm_crtc_helper.h> |
17 | #include "udl_drv.h" | 17 | #include "udl_drv.h" |
18 | 18 | ||
19 | /* dummy connector to just get EDID, | 19 | /* dummy connector to just get EDID, |
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index 9f84128505bb..c0770dbba74a 100644 --- a/drivers/gpu/drm/udl/udl_drv.c +++ b/drivers/gpu/drm/udl/udl_drv.c | |||
@@ -7,8 +7,8 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include "drm_usb.h" | 10 | #include <drm/drm_usb.h> |
11 | #include "drm_crtc_helper.h" | 11 | #include <drm/drm_crtc_helper.h> |
12 | #include "udl_drv.h" | 12 | #include "udl_drv.h" |
13 | 13 | ||
14 | static struct drm_driver driver; | 14 | static struct drm_driver driver; |
diff --git a/drivers/gpu/drm/udl/udl_encoder.c b/drivers/gpu/drm/udl/udl_encoder.c index 0731ab2e6c06..610538308f19 100644 --- a/drivers/gpu/drm/udl/udl_encoder.c +++ b/drivers/gpu/drm/udl/udl_encoder.c | |||
@@ -10,9 +10,9 @@ | |||
10 | * more details. | 10 | * more details. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | #include "drm_crtc.h" | 14 | #include <drm/drm_crtc.h> |
15 | #include "drm_crtc_helper.h" | 15 | #include <drm/drm_crtc_helper.h> |
16 | #include "udl_drv.h" | 16 | #include "udl_drv.h" |
17 | 17 | ||
18 | /* dummy encoder */ | 18 | /* dummy encoder */ |
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index ce9a61179925..877df059a76f 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c | |||
@@ -14,13 +14,12 @@ | |||
14 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
16 | 16 | ||
17 | #include "drmP.h" | 17 | #include <drm/drmP.h> |
18 | #include "drm.h" | 18 | #include <drm/drm_crtc.h> |
19 | #include "drm_crtc.h" | 19 | #include <drm/drm_crtc_helper.h> |
20 | #include "drm_crtc_helper.h" | ||
21 | #include "udl_drv.h" | 20 | #include "udl_drv.h" |
22 | 21 | ||
23 | #include "drm_fb_helper.h" | 22 | #include <drm/drm_fb_helper.h> |
24 | 23 | ||
25 | #define DL_DEFIO_WRITE_DELAY 5 /* fb_deferred_io.delay in jiffies */ | 24 | #define DL_DEFIO_WRITE_DELAY 5 /* fb_deferred_io.delay in jiffies */ |
26 | 25 | ||
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index 291ecc145585..4acc8c7431cd 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * more details. | 6 | * more details. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "drmP.h" | 9 | #include <drm/drmP.h> |
10 | #include "udl_drv.h" | 10 | #include "udl_drv.h" |
11 | #include <linux/shmem_fs.h> | 11 | #include <linux/shmem_fs.h> |
12 | #include <linux/dma-buf.h> | 12 | #include <linux/dma-buf.h> |
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index 4c2d836a0893..1f6dbfd62c2a 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * License v2. See the file COPYING in the main directory of this archive for | 10 | * License v2. See the file COPYING in the main directory of this archive for |
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | #include "udl_drv.h" | 14 | #include "udl_drv.h" |
15 | 15 | ||
16 | /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */ | 16 | /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */ |
diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index 9159d48d1dfd..52ac2b2d9b73 100644 --- a/drivers/gpu/drm/udl/udl_modeset.c +++ b/drivers/gpu/drm/udl/udl_modeset.c | |||
@@ -11,9 +11,9 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "drmP.h" | 14 | #include <drm/drmP.h> |
15 | #include "drm_crtc.h" | 15 | #include <drm/drm_crtc.h> |
16 | #include "drm_crtc_helper.h" | 16 | #include <drm/drm_crtc_helper.h> |
17 | #include "udl_drv.h" | 17 | #include "udl_drv.h" |
18 | 18 | ||
19 | /* | 19 | /* |
diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c index b9320e2608dd..e96348143a4e 100644 --- a/drivers/gpu/drm/udl/udl_transfer.c +++ b/drivers/gpu/drm/udl/udl_transfer.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
16 | #include <linux/prefetch.h> | 16 | #include <linux/prefetch.h> |
17 | 17 | ||
18 | #include "drmP.h" | 18 | #include <drm/drmP.h> |
19 | #include "udl_drv.h" | 19 | #include "udl_drv.h" |
20 | 20 | ||
21 | #define MAX_CMD_PIXELS 255 | 21 | #define MAX_CMD_PIXELS 255 |