diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-02 13:01:25 -0400 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-02 13:01:25 -0400 |
| commit | a1ce39288e6fbefdd8d607021d02384eb4a20b99 (patch) | |
| tree | c72e67f0c9d828420788f9086a19df1b9a7e39ae /include/drm | |
| parent | 760285e7e7ab282c25b5e90816f7c47000557f4f (diff) | |
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
Convert #include "..." to #include <path/...> in kernel system headers.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm.h | 2 | ||||
| -rw-r--r-- | include/drm/drmP.h | 14 | ||||
| -rw-r--r-- | include/drm/drm_buffer.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_encoder_slave.h | 4 | ||||
| -rw-r--r-- | include/drm/drm_memory.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_sarea.h | 2 | ||||
| -rw-r--r-- | include/drm/exynos_drm.h | 2 | ||||
| -rw-r--r-- | include/drm/i915_drm.h | 2 | ||||
| -rw-r--r-- | include/drm/mga_drm.h | 2 | ||||
| -rw-r--r-- | include/drm/radeon_drm.h | 2 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 2 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 16 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_execbuf_util.h | 2 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_lock.h | 2 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_object.h | 2 | ||||
| -rw-r--r-- | include/drm/ttm/ttm_page_alloc.h | 4 | ||||
| -rw-r--r-- | include/drm/via_drm.h | 2 |
17 files changed, 32 insertions, 32 deletions
diff --git a/include/drm/drm.h b/include/drm/drm.h index e51035a3757f..1e3481edf062 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h | |||
| @@ -628,7 +628,7 @@ struct drm_prime_handle { | |||
| 628 | __s32 fd; | 628 | __s32 fd; |
| 629 | }; | 629 | }; |
| 630 | 630 | ||
| 631 | #include "drm_mode.h" | 631 | #include <drm/drm_mode.h> |
| 632 | 632 | ||
| 633 | #define DRM_IOCTL_BASE 'd' | 633 | #define DRM_IOCTL_BASE 'd' |
| 634 | #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) | 634 | #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 1b33df4884b5..0c44e4a000fd 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
| @@ -85,9 +85,9 @@ struct module; | |||
| 85 | struct drm_file; | 85 | struct drm_file; |
| 86 | struct drm_device; | 86 | struct drm_device; |
| 87 | 87 | ||
| 88 | #include "drm_os_linux.h" | 88 | #include <drm/drm_os_linux.h> |
| 89 | #include "drm_hashtab.h" | 89 | #include <drm/drm_hashtab.h> |
| 90 | #include "drm_mm.h" | 90 | #include <drm/drm_mm.h> |
| 91 | 91 | ||
| 92 | #define DRM_UT_CORE 0x01 | 92 | #define DRM_UT_CORE 0x01 |
| 93 | #define DRM_UT_DRIVER 0x02 | 93 | #define DRM_UT_DRIVER 0x02 |
| @@ -676,7 +676,7 @@ struct drm_gem_object { | |||
| 676 | struct dma_buf_attachment *import_attach; | 676 | struct dma_buf_attachment *import_attach; |
| 677 | }; | 677 | }; |
| 678 | 678 | ||
| 679 | #include "drm_crtc.h" | 679 | #include <drm/drm_crtc.h> |
| 680 | 680 | ||
| 681 | /* per-master structure */ | 681 | /* per-master structure */ |
| 682 | struct drm_master { | 682 | struct drm_master { |
| @@ -1304,7 +1304,7 @@ extern void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *v | |||
| 1304 | extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); | 1304 | extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); |
| 1305 | 1305 | ||
| 1306 | /* Memory management support (drm_memory.h) */ | 1306 | /* Memory management support (drm_memory.h) */ |
| 1307 | #include "drm_memory.h" | 1307 | #include <drm/drm_memory.h> |
| 1308 | extern void drm_free_agp(DRM_AGP_MEM * handle, int pages); | 1308 | extern void drm_free_agp(DRM_AGP_MEM * handle, int pages); |
| 1309 | extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start); | 1309 | extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start); |
| 1310 | extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev, | 1310 | extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev, |
| @@ -1613,7 +1613,7 @@ void drm_gem_vm_open(struct vm_area_struct *vma); | |||
| 1613 | void drm_gem_vm_close(struct vm_area_struct *vma); | 1613 | void drm_gem_vm_close(struct vm_area_struct *vma); |
| 1614 | int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma); | 1614 | int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma); |
| 1615 | 1615 | ||
| 1616 | #include "drm_global.h" | 1616 | #include <drm/drm_global.h> |
| 1617 | 1617 | ||
| 1618 | static inline void | 1618 | static inline void |
| 1619 | drm_gem_object_reference(struct drm_gem_object *obj) | 1619 | drm_gem_object_reference(struct drm_gem_object *obj) |
| @@ -1722,7 +1722,7 @@ static __inline__ void drm_core_dropmap(struct drm_local_map *map) | |||
| 1722 | { | 1722 | { |
| 1723 | } | 1723 | } |
| 1724 | 1724 | ||
| 1725 | #include "drm_mem_util.h" | 1725 | #include <drm/drm_mem_util.h> |
| 1726 | 1726 | ||
| 1727 | extern int drm_fill_in_dev(struct drm_device *dev, | 1727 | extern int drm_fill_in_dev(struct drm_device *dev, |
| 1728 | const struct pci_device_id *ent, | 1728 | const struct pci_device_id *ent, |
diff --git a/include/drm/drm_buffer.h b/include/drm/drm_buffer.h index 322dbff3f861..c80d3a340b94 100644 --- a/include/drm/drm_buffer.h +++ b/include/drm/drm_buffer.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #ifndef _DRM_BUFFER_H_ | 35 | #ifndef _DRM_BUFFER_H_ |
| 36 | #define _DRM_BUFFER_H_ | 36 | #define _DRM_BUFFER_H_ |
| 37 | 37 | ||
| 38 | #include "drmP.h" | 38 | #include <drm/drmP.h> |
| 39 | 39 | ||
| 40 | struct drm_buffer { | 40 | struct drm_buffer { |
| 41 | int iterator; | 41 | int iterator; |
diff --git a/include/drm/drm_encoder_slave.h b/include/drm/drm_encoder_slave.h index 7dc385233805..b0c11a7809bb 100644 --- a/include/drm/drm_encoder_slave.h +++ b/include/drm/drm_encoder_slave.h | |||
| @@ -27,8 +27,8 @@ | |||
| 27 | #ifndef __DRM_ENCODER_SLAVE_H__ | 27 | #ifndef __DRM_ENCODER_SLAVE_H__ |
| 28 | #define __DRM_ENCODER_SLAVE_H__ | 28 | #define __DRM_ENCODER_SLAVE_H__ |
| 29 | 29 | ||
| 30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
| 31 | #include "drm_crtc.h" | 31 | #include <drm/drm_crtc.h> |
| 32 | 32 | ||
| 33 | /** | 33 | /** |
| 34 | * struct drm_encoder_slave_funcs - Entry points exposed by a slave encoder driver | 34 | * struct drm_encoder_slave_funcs - Entry points exposed by a slave encoder driver |
diff --git a/include/drm/drm_memory.h b/include/drm/drm_memory.h index 15af9b32ae42..4baf57a207e7 100644 --- a/include/drm/drm_memory.h +++ b/include/drm/drm_memory.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/highmem.h> | 36 | #include <linux/highmem.h> |
| 37 | #include <linux/vmalloc.h> | 37 | #include <linux/vmalloc.h> |
| 38 | #include "drmP.h" | 38 | #include <drm/drmP.h> |
| 39 | 39 | ||
| 40 | /** | 40 | /** |
| 41 | * Cut down version of drm_memory_debug.h, which used to be called | 41 | * Cut down version of drm_memory_debug.h, which used to be called |
diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h index ee5389d22c64..d3aedc90b9fd 100644 --- a/include/drm/drm_sarea.h +++ b/include/drm/drm_sarea.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #ifndef _DRM_SAREA_H_ | 32 | #ifndef _DRM_SAREA_H_ |
| 33 | #define _DRM_SAREA_H_ | 33 | #define _DRM_SAREA_H_ |
| 34 | 34 | ||
| 35 | #include "drm.h" | 35 | #include <drm/drm.h> |
| 36 | 36 | ||
| 37 | /* SAREA area needs to be at least a page */ | 37 | /* SAREA area needs to be at least a page */ |
| 38 | #if defined(__alpha__) | 38 | #if defined(__alpha__) |
diff --git a/include/drm/exynos_drm.h b/include/drm/exynos_drm.h index c20b00181530..1f2acdfbfd6d 100644 --- a/include/drm/exynos_drm.h +++ b/include/drm/exynos_drm.h | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #ifndef _EXYNOS_DRM_H_ | 29 | #ifndef _EXYNOS_DRM_H_ |
| 30 | #define _EXYNOS_DRM_H_ | 30 | #define _EXYNOS_DRM_H_ |
| 31 | 31 | ||
| 32 | #include "drm.h" | 32 | #include <drm/drm.h> |
| 33 | 33 | ||
| 34 | /** | 34 | /** |
| 35 | * User-desired buffer creation information structure. | 35 | * User-desired buffer creation information structure. |
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 8cc70837f929..814a42c89422 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #ifndef _I915_DRM_H_ | 27 | #ifndef _I915_DRM_H_ |
| 28 | #define _I915_DRM_H_ | 28 | #define _I915_DRM_H_ |
| 29 | 29 | ||
| 30 | #include "drm.h" | 30 | #include <drm/drm.h> |
| 31 | 31 | ||
| 32 | /* Please note that modifications to all structs defined here are | 32 | /* Please note that modifications to all structs defined here are |
| 33 | * subject to backwards-compatibility constraints. | 33 | * subject to backwards-compatibility constraints. |
diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h index fca817009e13..2375bfd6e5e9 100644 --- a/include/drm/mga_drm.h +++ b/include/drm/mga_drm.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #ifndef __MGA_DRM_H__ | 35 | #ifndef __MGA_DRM_H__ |
| 36 | #define __MGA_DRM_H__ | 36 | #define __MGA_DRM_H__ |
| 37 | 37 | ||
| 38 | #include "drm.h" | 38 | #include <drm/drm.h> |
| 39 | 39 | ||
| 40 | /* WARNING: If you change any of these defines, make sure to change the | 40 | /* WARNING: If you change any of these defines, make sure to change the |
| 41 | * defines in the Xserver file (mga_sarea.h) | 41 | * defines in the Xserver file (mga_sarea.h) |
