summaryrefslogtreecommitdiffstats
path: root/drivers/amba
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-03 11:54:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-03 11:54:39 -0800
commit529e5fbcd8d3cb48cf824ac8fde91cc80a9e985f (patch)
tree5b6792ea3fe35ba3a2900978b1679d5d0a8bbee3 /drivers/amba
parent686c09407d24123755ee05aae5be680be886a233 (diff)
parent16af43fef87512f7324205783526f543ddcf09cf (diff)
downloadlinux-529e5fbcd8d3cb48cf824ac8fde91cc80a9e985f.tar.gz
linux-529e5fbcd8d3cb48cf824ac8fde91cc80a9e985f.tar.bz2
linux-529e5fbcd8d3cb48cf824ac8fde91cc80a9e985f.zip
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
Pull late ARM updates from Russell King: "Here is the late set of ARM updates for this merge window; in here is: - The ARM parts of the broadcast timer support, core parts merged through tglx's tree. This was left over from the previous merge to allow the dependency on tglx's tree to be resolved. - A fix to the VFP code which shows up on Raspberry Pi's, as well as fixing the fallout from a previous commit in this area. - A number of smaller fixes scattered throughout the ARM tree" * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: ARM: Fix broken commit 0cc41e4a21d43 corrupting kernel messages ARM: fix scheduling while atomic warning in alignment handling code ARM: VFP: fix emulation of second VFP instruction ARM: 7656/1: uImage: Error out on build of multiplatform without LOADADDR ARM: 7640/1: memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU ARM: 7654/1: Preserve L_PTE_VALID in pte_modify() ARM: 7653/2: do not scale loops_per_jiffy when using a constant delay clock ARM: 7651/1: remove unused smp_timer_broadcast #define
Diffstat (limited to 'drivers/amba')
-rw-r--r--drivers/amba/tegra-ahb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c
index ab92785f54dc..093c43554963 100644
--- a/drivers/amba/tegra-ahb.c
+++ b/drivers/amba/tegra-ahb.c
@@ -130,7 +130,7 @@ static inline void gizmo_writel(struct tegra_ahb *ahb, u32 value, u32 offset)
writel(value, ahb->regs + offset);
}
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifdef CONFIG_TEGRA_IOMMU_SMMU
static int tegra_ahb_match_by_smmu(struct device *dev, void *data)
{
struct tegra_ahb *ahb = dev_get_drvdata(dev);