diff options
| author | Andrew Howe <ahowe@nvidia.com> | 2010-12-09 17:09:50 +0200 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:44:56 -0800 |
| commit | 952956f5baf9611d4ef99fb97f8a82078172c5c2 (patch) | |
| tree | 1683e86b022d2691ca911d8d429e641df6463153 /drivers/video/tegra/host/dev.h | |
| parent | a9fde4bbe27d66a8b0639363de2bbf1f04d27939 (diff) | |
[ARM/tegra] nvhost: Merge NVIDIA changes into Google's nvhost
Google's 2.6.36 nvhost driver branched from NVIDIA's 2.6.32 nvhost at some
point before it was actually committed to 2.6.32, but the former's
original commit included some fixes that were added to the latter after
that. Confusing... Also Google's version has some changes that we like
so they will remain, but that makes merging difficult.
Anyway, this commit brings the rest of our 2.6.32 changes into 2.6.36
and cleans it up a bit. It might be nicer to break this up into a load
of smaller commits but it turned out to be very difficult to do that.
Original-Change-Id: I828b624b089b811d6130173e55258da8f52a5cc2
Reviewed-on: http://git-master/r/12563
Tested-by: Jussi Rasanen <jrasanen@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Wei Sun <wsun@nvidia.com>
Original-Change-Id: I72fbcff16ec6df62cc7299052a84b91db252c8d1
Rebase-Id: Rb3aa29f2ecbecf889bbc6ccf7d0b26925f7b94fb
Diffstat (limited to 'drivers/video/tegra/host/dev.h')
| -rw-r--r-- | drivers/video/tegra/host/dev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/tegra/host/dev.h b/drivers/video/tegra/host/dev.h index 4f71ff5d9a9d..f39ea75681e4 100644 --- a/drivers/video/tegra/host/dev.h +++ b/drivers/video/tegra/host/dev.h @@ -22,6 +22,7 @@ #ifndef __NVHOST_DEV_H #define __NVHOST_DEV_H + #include "nvhost_acm.h" #include "nvhost_syncpt.h" #include "nvhost_intr.h" |