Skip to content

Commit

Permalink
UAPI: (Scripted) Convert #include "..." to #include <path/...> in dri…
Browse files Browse the repository at this point in the history
…vers/gpu/

Convert #include "..." to #include <path/...> in drivers/gpu/.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Dave Airlie <airlied@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>
  • Loading branch information
dhowells committed Oct 2, 2012
1 parent 4126d5d commit 760285e
Show file tree
Hide file tree
Showing 376 changed files with 731 additions and 731 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/ast/ast_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include <linux/module.h>
#include <linux/console.h>

#include "drmP.h"
#include "drm_crtc_helper.h"
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>

#include "ast_drv.h"

Expand Down
12 changes: 6 additions & 6 deletions drivers/gpu/drm/ast/ast_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
#ifndef __AST_DRV_H__
#define __AST_DRV_H__

#include "drm_fb_helper.h"
#include <drm/drm_fb_helper.h>

#include "ttm/ttm_bo_api.h"
#include "ttm/ttm_bo_driver.h"
#include "ttm/ttm_placement.h"
#include "ttm/ttm_memory.h"
#include "ttm/ttm_module.h"
#include <drm/ttm/ttm_bo_api.h>
#include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_memory.h>
#include <drm/ttm/ttm_module.h>

#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/ast/ast_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
#include <linux/init.h>


#include "drmP.h"
#include "drm_crtc.h"
#include "drm_fb_helper.h"
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h>
#include "ast_drv.h"

static void ast_dirty_update(struct ast_fbdev *afbdev,
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/ast/ast_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
/*
* Authors: Dave Airlie <airlied@redhat.com>
*/
#include "drmP.h"
#include <drm/drmP.h>
#include "ast_drv.h"


#include "drm_fb_helper.h"
#include "drm_crtc_helper.h"
#include <drm/drm_fb_helper.h>
#include <drm/drm_crtc_helper.h>

#include "ast_dram_tables.h"

Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/ast/ast_mode.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
* Authors: Dave Airlie <airlied@redhat.com>
*/
#include <linux/export.h>
#include "drmP.h"
#include "drm_crtc.h"
#include "drm_crtc_helper.h"
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
#include "ast_drv.h"

#include "ast_tables.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/ast/ast_post.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* Authors: Dave Airlie <airlied@redhat.com>
*/

#include "drmP.h"
#include <drm/drmP.h>
#include "ast_drv.h"

#include "ast_dram_tables.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/ast/ast_ttm.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/*
* Authors: Dave Airlie <airlied@redhat.com>
*/
#include "drmP.h"
#include <drm/drmP.h>
#include "ast_drv.h"
#include <ttm/ttm_page_alloc.h>

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/ati_pcigart.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/

#include <linux/export.h>
#include "drmP.h"
#include <drm/drmP.h>

# define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/cirrus/cirrus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
#include <linux/module.h>
#include <linux/console.h>
#include "drmP.h"
#include <drm/drmP.h>

#include "cirrus_drv.h"

Expand Down
10 changes: 5 additions & 5 deletions drivers/gpu/drm/cirrus/cirrus_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

#include <drm/drm_fb_helper.h>

#include "ttm/ttm_bo_api.h"
#include "ttm/ttm_bo_driver.h"
#include "ttm/ttm_placement.h"
#include "ttm/ttm_memory.h"
#include "ttm/ttm_module.h"
#include <drm/ttm/ttm_bo_api.h>
#include <drm/ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_placement.h>
#include <drm/ttm/ttm_memory.h>
#include <drm/ttm/ttm_module.h>

#define DRIVER_AUTHOR "Matthew Garrett"

Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/cirrus/cirrus_fbdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
* Dave Airlie
*/
#include <linux/module.h>
#include "drmP.h"
#include "drm_fb_helper.h"
#include <drm/drmP.h>
#include <drm/drm_fb_helper.h>

#include <linux/fb.h>

Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/cirrus/cirrus_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* Authors: Matthew Garrett
* Dave Airlie
*/
#include "drmP.h"
#include "drm_crtc_helper.h"
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>

#include "cirrus_drv.h"

Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/cirrus/cirrus_mode.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
*
* Copyright 1999-2001 Jeff Garzik <jgarzik@pobox.com>
*/
#include "drmP.h"
#include "drm_crtc_helper.h"
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>

#include <video/cirrus.h>

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/cirrus/cirrus_ttm.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/*
* Authors: Dave Airlie <airlied@redhat.com>
*/
#include "drmP.h"
#include <drm/drmP.h>
#include "cirrus_drv.h"
#include <ttm/ttm_page_alloc.h>

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_agpsupport.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

#include "drmP.h"
#include <drm/drmP.h>
#include <linux/module.h>
#include <linux/slab.h>

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_auth.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

#include "drmP.h"
#include <drm/drmP.h>

/**
* Find the file with the given magic number.
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/

#include <linux/export.h>
#include "drm_buffer.h"
#include <drm/drm_buffer.h>

/**
* Allocate the drm buffer object.
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_bufs.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include <linux/log2.h>
#include <linux/export.h>
#include <asm/shmparam.h>
#include "drmP.h"
#include <drm/drmP.h>

static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
struct drm_local_map *map)
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/

#include <linux/export.h>
#include "drmP.h"
#include <drm/drmP.h>

#if defined(CONFIG_X86)
static void
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_context.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* needed by SiS driver's memory management.
*/

#include "drmP.h"
#include <drm/drmP.h>

/******************************************************************/
/** \name Context bitmap support */
Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/drm_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include <linux/list.h>
#include <linux/slab.h>
#include <linux/export.h>
#include "drmP.h"
#include "drm_crtc.h"
#include "drm_edid.h"
#include "drm_fourcc.h"
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
#include <drm/drm_fourcc.h>

/* Avoid boilerplate. I'm tired of typing. */
#define DRM_ENUM_NAME_FN(fnname, list) \
Expand Down
12 changes: 6 additions & 6 deletions drivers/gpu/drm/drm_crtc_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
#include <linux/export.h>
#include <linux/moduleparam.h>

#include "drmP.h"
#include "drm_crtc.h"
#include "drm_fourcc.h"
#include "drm_crtc_helper.h"
#include "drm_fb_helper.h"
#include "drm_edid.h"
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_fourcc.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_edid.h>

static bool drm_kms_helper_poll = true;
module_param_named(poll, drm_kms_helper_poll, bool, 0600);
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/export.h>
#include "drmP.h"
#include <drm/drmP.h>

#if defined(CONFIG_DEBUG_FS)

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
*/

#include <linux/export.h>
#include "drmP.h"
#include <drm/drmP.h>

/**
* Initialize the DMA data.
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_dp_i2c_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/i2c.h>
#include "drm_dp_helper.h"
#include "drmP.h"
#include <drm/drm_dp_helper.h>
#include <drm/drmP.h>

/* Run a single AUX_CH I2C transaction, writing/reading data as necessary */
static int
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
#include <linux/debugfs.h>
#include <linux/slab.h>
#include <linux/export.h>
#include "drmP.h"
#include "drm_core.h"
#include <drm/drmP.h>
#include <drm/drm_core.h>


static int drm_version(struct drm_device *dev, void *data,
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_edid.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/module.h>
#include "drmP.h"
#include "drm_edid.h"
#include <drm/drmP.h>
#include <drm/drm_edid.h>
#include "drm_edid_modes.h"

#define version_greater(edid, maj, min) \
Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/drm_edid_load.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

#include <linux/module.h>
#include <linux/firmware.h>
#include "drmP.h"
#include "drm_crtc.h"
#include "drm_crtc_helper.h"
#include "drm_edid.h"
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_edid.h>

static char edid_firmware[PATH_MAX];
module_param_string(edid_firmware, edid_firmware, sizeof(edid_firmware), 0644);
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_edid_modes.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
*/

#include <linux/kernel.h>
#include "drmP.h"
#include "drm_edid.h"
#include <drm/drmP.h>
#include <drm/drm_edid.h>

/*
* Autogenerated from the DMT spec.
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_encoder_slave.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <linux/module.h>

#include "drm_encoder_slave.h"
#include <drm/drm_encoder_slave.h>

/**
* drm_i2c_encoder_init - Initialize an I2C slave encoder
Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/drm_fb_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include <linux/slab.h>
#include <linux/fb.h>
#include <linux/module.h>
#include "drmP.h"
#include "drm_crtc.h"
#include "drm_fb_helper.h"
#include "drm_crtc_helper.h"
#include <drm/drmP.h>
#include <drm/drm_crtc.h>
#include <drm/drm_fb_helper.h>
#include <drm/drm_crtc_helper.h>

MODULE_AUTHOR("David Airlie, Jesse Barnes");
MODULE_DESCRIPTION("DRM KMS helper");
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

#include "drmP.h"
#include <drm/drmP.h>
#include <linux/poll.h>
#include <linux/slab.h>
#include <linux/module.h>
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <linux/pagemap.h>
#include <linux/shmem_fs.h>
#include <linux/dma-buf.h>
#include "drmP.h"
#include <drm/drmP.h>

/** @file drm_gem.c
*
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_global.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <linux/mutex.h>
#include <linux/slab.h>
#include <linux/module.h>
#include "drm_global.h"
#include <drm/drm_global.h>

struct drm_global_item {
struct mutex mutex;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_hashtab.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
* Thomas Hellström <thomas-at-tungstengraphics-dot-com>
*/

#include "drmP.h"
#include "drm_hashtab.h"
#include <drm/drmP.h>
#include <drm/drm_hashtab.h>
#include <linux/hash.h>
#include <linux/slab.h>
#include <linux/export.h>
Expand Down
Loading

0 comments on commit 760285e

Please sign in to comment.