diff options
author | 2014-07-17 15:01:19 +0200 | |
---|---|---|
committer | 2014-07-17 15:01:19 +0200 | |
commit | b0b64f7b2d35eb8df056e1252ce971ebc624372c (patch) | |
tree | 3176ddacf7941d95e3743b9af1f5802a3d8ffe0c /drivers/gpu/drm/tegra/sor.c | |
parent | Linux 3.16-rc1 (diff) | |
parent | soc/tegra: fuse: fix dummy functions (diff) | |
download | wireguard-linux-b0b64f7b2d35eb8df056e1252ce971ebc624372c.tar.xz wireguard-linux-b0b64f7b2d35eb8df056e1252ce971ebc624372c.zip |
Merge branch 'for-3.17/fuse-move' into for-3.17/dt
Diffstat (limited to 'drivers/gpu/drm/tegra/sor.c')
-rw-r--r-- | drivers/gpu/drm/tegra/sor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 27c979b50111..eafd0b8a71d2 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -11,7 +11,8 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/reset.h> -#include <linux/tegra-powergate.h> + +#include <soc/tegra/powergate.h> #include <drm/drm_dp_helper.h> |