summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/host
diff options
context:
space:
mode:
authorKrishna Reddy <vdumpa@nvidia.com>2012-05-15 19:48:35 -0700
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-05-18 05:02:12 -0700
commita61e9645adce49a5fc78c25daf5ef3e3ee721a64 (patch)
tree5c8b555ea14542c5405851ae0bd907a4f1479666 /drivers/video/tegra/host
parentc7946e0131f5e8f5ef014dba9404d236893e1bec (diff)
video: tegra: host: Use nvmap.h include file from kernel/include
Use nvmap.h include file from kernel/include instead of mach-tegra/include. Bug 854182 Change-Id: I9a44471dc77d1ed7aa3b6e61a5eca4833fe6dc25 Signed-off-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-on: http://git-master/r/102721 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host')
-rw-r--r--drivers/video/tegra/host/bus_client.c2
-rw-r--r--drivers/video/tegra/host/dev.c2
-rw-r--r--drivers/video/tegra/host/gr3d/gr3d.c2
-rw-r--r--drivers/video/tegra/host/nvhost_cdma.h2
-rw-r--r--drivers/video/tegra/host/nvhost_hwctx.h2
-rw-r--r--drivers/video/tegra/host/nvhost_job.c2
-rw-r--r--drivers/video/tegra/host/nvhost_syncpt.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/tegra/host/bus_client.c b/drivers/video/tegra/host/bus_client.c
index 4aacde958954..fd632a6ea9c5 100644
--- a/drivers/video/tegra/host/bus_client.c
+++ b/drivers/video/tegra/host/bus_client.c
@@ -36,7 +36,7 @@
#include <linux/nvhost.h>
#include <linux/nvhost_ioctl.h>
-#include <mach/nvmap.h>
+#include <linux/nvmap.h>
#include <mach/gpufuse.h>
#include <mach/hardware.h>
#include <mach/iomap.h>
diff --git a/drivers/video/tegra/host/dev.c b/drivers/video/tegra/host/dev.c
index f215b532d2bb..77d335f0751e 100644
--- a/drivers/video/tegra/host/dev.c
+++ b/drivers/video/tegra/host/dev.c
@@ -45,7 +45,7 @@
#include "t30/t30.h"
#include "bus_client.h"
#include "nvhost_acm.h"
-#include <mach/nvmap.h>
+#include <linux/nvmap.h>
#include "nvhost_channel.h"
#include "nvhost_job.h"
diff --git a/drivers/video/tegra/host/gr3d/gr3d.c b/drivers/video/tegra/host/gr3d/gr3d.c
index da3d498a398f..517cc8383966 100644
--- a/drivers/video/tegra/host/gr3d/gr3d.c
+++ b/drivers/video/tegra/host/gr3d/gr3d.c
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <mach/nvmap.h>
+#include <linux/nvmap.h>
#include <linux/slab.h>
#include "t20/t20.h"
diff --git a/drivers/video/tegra/host/nvhost_cdma.h b/drivers/video/tegra/host/nvhost_cdma.h
index b947afe18c32..e6f51179150f 100644
--- a/drivers/video/tegra/host/nvhost_cdma.h
+++ b/drivers/video/tegra/host/nvhost_cdma.h
@@ -25,7 +25,7 @@
#include <linux/semaphore.h>
#include <linux/nvhost.h>
-#include <mach/nvmap.h>
+#include <linux/nvmap.h>
#include <linux/list.h>
struct nvhost_syncpt;
diff --git a/drivers/video/tegra/host/nvhost_hwctx.h b/drivers/video/tegra/host/nvhost_hwctx.h
index 02a3976f01ce..75ed0be1a72c 100644
--- a/drivers/video/tegra/host/nvhost_hwctx.h
+++ b/drivers/video/tegra/host/nvhost_hwctx.h
@@ -25,7 +25,7 @@
#include <linux/kref.h>
#include <linux/nvhost.h>
-#include <mach/nvmap.h>
+#include <linux/nvmap.h>
struct nvhost_channel;
struct nvhost_cdma;
diff --git a/drivers/video/tegra/host/nvhost_job.c b/drivers/video/tegra/host/nvhost_job.c
index 5cd04a3a78a1..71f2ab0e751f 100644
--- a/drivers/video/tegra/host/nvhost_job.c
+++ b/drivers/video/tegra/host/nvhost_job.c
@@ -22,7 +22,7 @@
#include <linux/kref.h>
#include <linux/err.h>
#include <linux/vmalloc.h>
-#include <mach/nvmap.h>
+#include <linux/nvmap.h>
#include "nvhost_channel.h"
#include "nvhost_job.h"
#include "nvhost_hwctx.h"
diff --git a/drivers/video/tegra/host/nvhost_syncpt.h b/drivers/video/tegra/host/nvhost_syncpt.h
index 7625905bfa9c..b770ed91c76c 100644
--- a/drivers/video/tegra/host/nvhost_syncpt.h
+++ b/drivers/video/tegra/host/nvhost_syncpt.h
@@ -24,7 +24,7 @@
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/nvhost.h>
-#include <mach/nvmap.h>
+#include <linux/nvmap.h>
#include <linux/atomic.h>
/* host managed and invalid syncpt id */