diff options
| author | Hiroshi DOYU <hdoyu@nvidia.com> | 2012-01-09 08:52:47 +0200 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-01-12 09:12:50 -0800 |
| commit | 6ebf00f50a55b3a9248ebd0e2c023f8aecde8e95 (patch) | |
| tree | d9ac8dffd4278c4dbe9096c9858a53cebebd9a4d /arch | |
| parent | 7fe7ca90275001eda883076ae14cb3821554f465 (diff) | |
arm: tegra: smmu: Move tegra_smmu.h under "include/mach"
This is the preparation the following patches so that this header can
be referred from another directly than "arch/arm/mach-tegra".
Change-Id: I846970f306ff3daa8229e10e6f33b8e9fcf57cf9
Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com>
Reviewed-on: http://git-master/r/73947
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/tegra_smmu.h (renamed from arch/arm/mach-tegra/tegra_smmu.h) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/iovmm-smmu.c | 5 |
4 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 103634a9cec4..ea3ca06328ef 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -2,7 +2,7 @@ * arch/arm/mach-tegra/common.c * * Copyright (C) 2010 Google, Inc. - * Copyright (C) 2010-2011 NVIDIA Corporation + * Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. * * Author: * Colin Cross <ccross@android.com> @@ -37,6 +37,7 @@ #include <mach/pinmux.h> #include <mach/powergate.h> #include <mach/system.h> +#include <mach/tegra_smmu.h> #include "apbio.h" #include "board.h" @@ -44,7 +45,6 @@ #include "fuse.h" #include "pm.h" #include "reset.h" -#include "tegra_smmu.h" #define MC_SECURITY_CFG2 0x7c diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index e055e1d7e84c..59638a59d275 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -5,7 +5,7 @@ * Colin Cross <ccross@android.com> * Erik Gilling <ccross@android.com> * - * Copyright (C) 2010-2011 NVIDIA Corporation. + * Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -33,8 +33,9 @@ #include <mach/iomap.h> #include <mach/dma.h> #include <mach/usb_phy.h> +#include <mach/tegra_smmu.h> #include "gpio-names.h" -#include "tegra_smmu.h" + #if !defined(CONFIG_ARCH_TEGRA_2x_SOC) #define UART_SOURCE_RATE 408000000 diff --git a/arch/arm/mach-tegra/tegra_smmu.h b/arch/arm/mach-tegra/include/mach/tegra_smmu.h index 40a22a76997e..c4401c45a481 100644 --- a/arch/arm/mach-tegra/tegra_smmu.h +++ b/arch/arm/mach-tegra/include/mach/tegra_smmu.h @@ -1,7 +1,7 @@ /* - * arch/arm/mach-tegra/tegra_smmu.h + * arch/arm/mach-tegra/include/mach/tegra_smmu.h * - * Copyright (C) 2011 NVIDIA Corporation. + * Copyright (c) 2011-2012, NVIDIA CORPORATION. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and diff --git a/arch/arm/mach-tegra/iovmm-smmu.c b/arch/arm/mach-tegra/iovmm-smmu.c index 1f67096736a2..170afd15f1c3 100644 --- a/arch/arm/mach-tegra/iovmm-smmu.c +++ b/arch/arm/mach-tegra/iovmm-smmu.c @@ -4,7 +4,7 @@ * Tegra I/O VMM implementation for SMMU devices for Tegra 3 series * systems-on-a-chip. * - * Copyright (c) 2010-2011, NVIDIA Corporation. + * Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -38,8 +38,7 @@ #include <mach/iovmm.h> #include <mach/iomap.h> - -#include "tegra_smmu.h" +#include <mach/tegra_smmu.h> #ifndef CONFIG_ARCH_TEGRA_2x_SOC /* |