diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-07-17 16:58:18 +0400 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-07-17 16:58:18 +0400 |
| commit | dd849e581d7d23e1729c23bb2d6b85360ce4dd9d (patch) | |
| tree | 3176ddacf7941d95e3743b9af1f5802a3d8ffe0c /drivers/gpu/drm/tegra/sor.c | |
| parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) | |
| parent | 2fa937a767bd0933dfe6017cabd038ce52594171 (diff) | |
| download | linux-dd849e581d7d23e1729c23bb2d6b85360ce4dd9d.tar.xz | |
Merge branch 'for-3.17/fuse-move' into for-3.17/soc
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> |