diff options
Diffstat (limited to 'drivers/gpu/drm/r128')
-rw-r--r-- | drivers/gpu/drm/r128/r128_cce.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/r128_drv.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/r128_ioc32.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/r128_irq.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/r128/r128_state.c | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c index 47d3b1c2c776..d4660cf942a5 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c | |||
@@ -34,8 +34,8 @@ | |||
34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
36 | 36 | ||
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | #include "r128_drm.h" | 38 | #include <drm/r128_drm.h> |
39 | #include "r128_drv.h" | 39 | #include "r128_drv.h" |
40 | 40 | ||
41 | #define R128_FIFO_DEBUG 0 | 41 | #define R128_FIFO_DEBUG 0 |
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c index f97865656409..472c38fe123f 100644 --- a/drivers/gpu/drm/r128/r128_drv.c +++ b/drivers/gpu/drm/r128/r128_drv.c | |||
@@ -31,11 +31,11 @@ | |||
31 | 31 | ||
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "r128_drm.h" | 35 | #include <drm/r128_drm.h> |
36 | #include "r128_drv.h" | 36 | #include "r128_drv.h" |
37 | 37 | ||
38 | #include "drm_pciids.h" | 38 | #include <drm/drm_pciids.h> |
39 | 39 | ||
40 | static struct pci_device_id pciidlist[] = { | 40 | static struct pci_device_id pciidlist[] = { |
41 | r128_PCI_IDS | 41 | r128_PCI_IDS |
diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c index b7fe63814226..a954c548201e 100644 --- a/drivers/gpu/drm/r128/r128_ioc32.c +++ b/drivers/gpu/drm/r128/r128_ioc32.c | |||
@@ -31,8 +31,8 @@ | |||
31 | */ | 31 | */ |
32 | #include <linux/compat.h> | 32 | #include <linux/compat.h> |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "r128_drm.h" | 35 | #include <drm/r128_drm.h> |
36 | 36 | ||
37 | typedef struct drm_r128_init32 { | 37 | typedef struct drm_r128_init32 { |
38 | int func; | 38 | int func; |
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c index 4d8fdb6b994e..2ea4f09d2691 100644 --- a/drivers/gpu/drm/r128/r128_irq.c +++ b/drivers/gpu/drm/r128/r128_irq.c | |||
@@ -30,8 +30,8 @@ | |||
30 | * Eric Anholt <anholt@FreeBSD.org> | 30 | * Eric Anholt <anholt@FreeBSD.org> |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "r128_drm.h" | 34 | #include <drm/r128_drm.h> |
35 | #include "r128_drv.h" | 35 | #include "r128_drv.h" |
36 | 36 | ||
37 | u32 r128_get_vblank_counter(struct drm_device *dev, int crtc) | 37 | u32 r128_get_vblank_counter(struct drm_device *dev, int crtc) |
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c index 9fd939da6ab8..19bb7e6f3d9a 100644 --- a/drivers/gpu/drm/r128/r128_state.c +++ b/drivers/gpu/drm/r128/r128_state.c | |||
@@ -28,8 +28,8 @@ | |||
28 | * Gareth Hughes <gareth@valinux.com> | 28 | * Gareth Hughes <gareth@valinux.com> |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "r128_drm.h" | 32 | #include <drm/r128_drm.h> |
33 | #include "r128_drv.h" | 33 | #include "r128_drv.h" |
34 | 34 | ||
35 | /* ================================================================ | 35 | /* ================================================================ |