diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 06:54:23 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 04:40:49 +0200 |
| commit | 43a70661eaa64aa4e36e421eee3b9ded3190837b (patch) | |
| tree | c0792db927aec0ba026039edb894c9460d252c7e /drivers/gpu/drm/nouveau/include/nvif | |
| parent | drm/nouveau/pci: merge agp handling from nouveau drm (diff) | |
| download | linux-43a70661eaa64aa4e36e421eee3b9ded3190837b.tar.xz linux-43a70661eaa64aa4e36e421eee3b9ded3190837b.zip | |
drm/nouveau/tegra: merge platform setup from nouveau drm
The copyright header in nvkm/engine/device/platform.c has been replaced
with the NVIDIA one from drm/nouveau_platform.c, as most of the actual
code is now theirs.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include/nvif')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvif/os.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvif/os.h b/drivers/gpu/drm/nouveau/include/nvif/os.h index 97317f7fe4e5..3accc99d8e0b 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/os.h +++ b/drivers/gpu/drm/nouveau/include/nvif/os.h @@ -25,10 +25,13 @@ #include <linux/clk.h> #include <linux/regulator/consumer.h> #include <linux/agp_backend.h> +#include <linux/reset.h> +#include <linux/iommu.h> #include <asm/unaligned.h> #include <soc/tegra/fuse.h> +#include <soc/tegra/pmc.h> #ifndef ioread32_native #ifdef __BIG_ENDIAN |