summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/tegra/dc/dc.c2
-rw-r--r--drivers/video/tegra/dc/dsi.c2
-rw-r--r--drivers/video/tegra/dc/hdmi.c2
-rw-r--r--drivers/video/tegra/dc/nvhdcp.c1
-rw-r--r--drivers/video/tegra/dc/overlay.c2
-rw-r--r--drivers/video/tegra/fb.c2
-rw-r--r--drivers/video/tegra/host/bus.c9
-rw-r--r--drivers/video/tegra/host/chip_support.h1
-rw-r--r--drivers/video/tegra/host/dev.c3
-rw-r--r--drivers/video/tegra/host/nvhost_cdma.h2
-rw-r--r--drivers/video/tegra/host/nvhost_channel.h3
-rw-r--r--drivers/video/tegra/host/nvhost_hwctx.h2
-rw-r--r--drivers/video/tegra/host/nvhost_syncpt.c3
-rw-r--r--drivers/video/tegra/host/nvhost_syncpt.h7
-rw-r--r--drivers/video/tegra/host/t20/syncpt_t20.c1
15 files changed, 23 insertions, 19 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index f7c0ec81f5f3..cba700940da6 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -40,7 +40,7 @@
#include <mach/dc.h>
#include <mach/fb.h>
#include <mach/mc.h>
-#include <mach/nvhost.h>
+#include <linux/nvhost.h>
#include <mach/latency_allowance.h>
#include "dc_reg.h"
diff --git a/drivers/video/tegra/dc/dsi.c b/drivers/video/tegra/dc/dsi.c
index 68dd07be041c..c83b6151d380 100644
--- a/drivers/video/tegra/dc/dsi.c
+++ b/drivers/video/tegra/dc/dsi.c
@@ -28,7 +28,7 @@
#include <mach/clk.h>
#include <mach/dc.h>
#include <mach/fb.h>
-#include <mach/nvhost.h>
+#include <linux/nvhost.h>
#include <../gpio-names.h>
#include "dc_reg.h"
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index 4672ca1ebc0b..71163b274289 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -33,7 +33,7 @@
#include <mach/clk.h>
#include <mach/dc.h>
#include <mach/fb.h>
-#include <mach/nvhost.h>
+#include <linux/nvhost.h>
#include <mach/hdmi-audio.h>
#include <video/tegrafb.h>
diff --git a/drivers/video/tegra/dc/nvhdcp.c b/drivers/video/tegra/dc/nvhdcp.c
index bac87781bb9d..5ff53949864e 100644
--- a/drivers/video/tegra/dc/nvhdcp.c
+++ b/drivers/video/tegra/dc/nvhdcp.c
@@ -26,7 +26,6 @@
#include <asm/atomic.h>
#include <mach/dc.h>
-#include <mach/nvhost.h>
#include <mach/kfuse.h>
#include <video/nvhdcp.h>
diff --git a/drivers/video/tegra/dc/overlay.c b/drivers/video/tegra/dc/overlay.c
index 6f42242a7102..c8a49c8ed3b3 100644
--- a/drivers/video/tegra/dc/overlay.c
+++ b/drivers/video/tegra/dc/overlay.c
@@ -33,7 +33,7 @@
#include <mach/dc.h>
#include <mach/fb.h>
-#include <mach/nvhost.h>
+#include <linux/nvhost.h>
#include "dc_priv.h"
#include "../nvmap/nvmap.h"
diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c
index 6aff1cab30d4..0787131d8dd8 100644
--- a/drivers/video/tegra/fb.c
+++ b/drivers/video/tegra/fb.c
@@ -36,7 +36,7 @@
#include <mach/dc.h>
#include <mach/fb.h>
-#include <mach/nvhost.h>
+#include <linux/nvhost.h>
#include <mach/nvmap.h>
#include "host/dev.h"
diff --git a/drivers/video/tegra/host/bus.c b/drivers/video/tegra/host/bus.c
index a633950aeaff..0ba30dd99ffa 100644
--- a/drivers/video/tegra/host/bus.c
+++ b/drivers/video/tegra/host/bus.c
@@ -2,11 +2,9 @@
* drivers/video/tegra/host/bus.c
*
* Copyright (C) 2010 Google, Inc.
+ * Author: Erik Gilling <konkers@google.com>
*
- * Author:
- * Erik Gilling <konkers@google.com>
- *
- * based heavily on drivers/base/platform.c
+ * Copyright (C) 2010-2011 NVIDIA Corporation
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -20,8 +18,7 @@
*/
#include <linux/pm_runtime.h>
-
-#include <mach/nvhost.h>
+#include <linux/nvhost.h>
#include "dev.h"
diff --git a/drivers/video/tegra/host/chip_support.h b/drivers/video/tegra/host/chip_support.h
index c63200189b34..a0b0f0278a0f 100644
--- a/drivers/video/tegra/host/chip_support.h
+++ b/drivers/video/tegra/host/chip_support.h
@@ -23,6 +23,7 @@
#define _NVHOST_CHIP_SUPPORT_H_
struct output;
+struct nvhost_waitchk;
struct nvhost_chip_support {
struct {
diff --git a/drivers/video/tegra/host/dev.c b/drivers/video/tegra/host/dev.c
index 16479962127d..37d18bc2d175 100644
--- a/drivers/video/tegra/host/dev.c
+++ b/drivers/video/tegra/host/dev.c
@@ -37,7 +37,8 @@
#include <asm/io.h>
-#include <mach/nvhost.h>
+#include <linux/nvhost.h>
+#include <linux/nvhost_ioctl.h>
#include <mach/nvmap.h>
#include <mach/gpufuse.h>
diff --git a/drivers/video/tegra/host/nvhost_cdma.h b/drivers/video/tegra/host/nvhost_cdma.h
index 64d17249f6af..e48d733850a9 100644
--- a/drivers/video/tegra/host/nvhost_cdma.h
+++ b/drivers/video/tegra/host/nvhost_cdma.h
@@ -26,7 +26,7 @@
#include <linux/sched.h>
#include <linux/semaphore.h>
-#include <mach/nvhost.h>
+#include <linux/nvhost.h>
#include <mach/nvmap.h>
#include "nvhost_acm.h"
diff --git a/drivers/video/tegra/host/nvhost_channel.h b/drivers/video/tegra/host/nvhost_channel.h
index e108a2078911..c939a19d3fad 100644
--- a/drivers/video/tegra/host/nvhost_channel.h
+++ b/drivers/video/tegra/host/nvhost_channel.h
@@ -3,7 +3,7 @@
*
* Tegra Graphics Host Channel
*
- * Copyright (c) 2010, NVIDIA Corporation.
+ * Copyright (c) 2010-2011, NVIDIA Corporation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@
#define NVHOST_MAX_HANDLES 1280
struct nvhost_master;
+struct nvhost_waitchk;
struct nvhost_channeldesc {
const char *name;
diff --git a/drivers/video/tegra/host/nvhost_hwctx.h b/drivers/video/tegra/host/nvhost_hwctx.h
index 83d93bd871eb..06df90e58fb5 100644
--- a/drivers/video/tegra/host/nvhost_hwctx.h
+++ b/drivers/video/tegra/host/nvhost_hwctx.h
@@ -26,7 +26,7 @@
#include <linux/string.h>
#include <linux/kref.h>
-#include <mach/nvhost.h>
+#include <linux/nvhost.h>
#include <mach/nvmap.h>
struct nvhost_channel;
diff --git a/drivers/video/tegra/host/nvhost_syncpt.c b/drivers/video/tegra/host/nvhost_syncpt.c
index 71233096c0c6..6236dedf5f88 100644
--- a/drivers/video/tegra/host/nvhost_syncpt.c
+++ b/drivers/video/tegra/host/nvhost_syncpt.c
@@ -3,7 +3,7 @@
*
* Tegra Graphics Host Syncpoints
*
- * Copyright (c) 2010, NVIDIA Corporation.
+ * Copyright (c) 2010-2011, NVIDIA Corporation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include <linux/nvhost_ioctl.h>
#include "nvhost_syncpt.h"
#include "dev.h"
diff --git a/drivers/video/tegra/host/nvhost_syncpt.h b/drivers/video/tegra/host/nvhost_syncpt.h
index b6db72e915a9..c8f8b4bb1262 100644
--- a/drivers/video/tegra/host/nvhost_syncpt.h
+++ b/drivers/video/tegra/host/nvhost_syncpt.h
@@ -3,7 +3,7 @@
*
* Tegra Graphics Host Syncpoints
*
- * Copyright (c) 2010, NVIDIA Corporation.
+ * Copyright (c) 2010-2011, NVIDIA Corporation.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -25,10 +25,13 @@
#include <linux/kernel.h>
#include <linux/sched.h>
-#include <mach/nvhost.h>
+#include <linux/nvhost.h>
#include <mach/nvmap.h>
#include <asm/atomic.h>
+struct nvhost_syncpt;
+struct nvhost_waitchk;
+
/* host managed and invalid syncpt id */
#define NVSYNCPT_GRAPHICS_HOST (0)
#define NVSYNCPT_INVALID (-1)
diff --git a/drivers/video/tegra/host/t20/syncpt_t20.c b/drivers/video/tegra/host/t20/syncpt_t20.c
index ade896e6299e..781654b656da 100644
--- a/drivers/video/tegra/host/t20/syncpt_t20.c
+++ b/drivers/video/tegra/host/t20/syncpt_t20.c
@@ -20,6 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include <linux/nvhost_ioctl.h>
#include "../nvhost_syncpt.h"
#include "../dev.h"
generated by cgit v1.2.3 (git 2.0.4) at 2024-06-12 17:39:35 +0000