diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-09-19 15:51:01 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-11-05 11:36:06 -0700 |
| commit | cc95e347cbba3a29c6f8c95ec737624afe489d8e (patch) | |
| tree | 53a4e5a5051b49d2e42a4a5a813ad1150df1e292 | |
| parent | a25186eb03f1f89eacda559d39c14e3cf8ffae13 (diff) | |
| download | linux-3.10-cc95e347cbba3a29c6f8c95ec737624afe489d8e.tar.gz linux-3.10-cc95e347cbba3a29c6f8c95ec737624afe489d8e.tar.bz2 linux-3.10-cc95e347cbba3a29c6f8c95ec737624afe489d8e.zip | |
ARM: tegra: move tegra-ahb.h out of arch/arm/mach-tegra/
We wish to empty arch/arm/mach-tegra/include/mach/ as much as possible
to enable single zImage. Move tegra-ahb.h to a more central location
(suggested by Arnd, OK'd by Greg KH), and actually make tegra-ahb.c
include the header to ensure client and provider agree on the prototype.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rw-r--r-- | drivers/amba/tegra-ahb.c | 1 | ||||
| -rw-r--r-- | drivers/iommu/tegra-smmu.c | 3 | ||||
| -rw-r--r-- | include/linux/tegra-ahb.h (renamed from arch/arm/mach-tegra/include/mach/tegra-ahb.h) | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c index 0b6f0b28a48..bd5de08ad6f 100644 --- a/drivers/amba/tegra-ahb.c +++ b/drivers/amba/tegra-ahb.c @@ -24,6 +24,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/tegra-ahb.h> #define DRV_NAME "tegra-ahb" diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 3fb95dde20f..41678639b7e 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -34,12 +34,11 @@ #include <linux/of_iommu.h> #include <linux/debugfs.h> #include <linux/seq_file.h> +#include <linux/tegra-ahb.h> #include <asm/page.h> #include <asm/cacheflush.h> -#include <mach/tegra-ahb.h> - enum smmu_hwgrp { HWGRP_AFI, HWGRP_AVPC, diff --git a/arch/arm/mach-tegra/include/mach/tegra-ahb.h b/include/linux/tegra-ahb.h index e0f8c84b1d8..f1cd075ceee 100644 --- a/arch/arm/mach-tegra/include/mach/tegra-ahb.h +++ b/include/linux/tegra-ahb.h @@ -11,9 +11,9 @@ * more details. */ -#ifndef __MACH_TEGRA_AHB_H__ -#define __MACH_TEGRA_AHB_H__ +#ifndef __LINUX_AHB_H__ +#define __LINUX_AHB_H__ extern int tegra_ahb_enable_smmu(struct device_node *ahb); -#endif /* __MACH_TEGRA_AHB_H__ */ +#endif /* __LINUX_AHB_H__ */ |