summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/Kconfig1
-rw-r--r--arch/arm/mach-tegra/include/mach/iovmm.h6
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 4e751cce8044..bcb10cb8e4ee 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -30,7 +30,6 @@ config ARCH_TEGRA_3x_SOC
select CPU_V7
select ARM_GIC
select ARCH_REQUIRE_GPIOLIB
- select TEGRA_IOVMM
select USB_ARCH_HAS_EHCI if USB_SUPPORT
select USB_EHCI_TEGRA if USB_SUPPORT
select USB_ULPI if USB_SUPPORT
diff --git a/arch/arm/mach-tegra/include/mach/iovmm.h b/arch/arm/mach-tegra/include/mach/iovmm.h
index 80c68b237bf9..c5abd4debf69 100644
--- a/arch/arm/mach-tegra/include/mach/iovmm.h
+++ b/arch/arm/mach-tegra/include/mach/iovmm.h
@@ -224,7 +224,7 @@ static inline void tegra_iovmm_client_unlock(struct tegra_iovmm_client *client)
static inline struct tegra_iovmm_area *tegra_iovmm_create_vm(
struct tegra_iovmm_client *client, struct tegra_iovmm_area_ops *ops,
- unsigned long size, pgprot_t pgprot, unsigned long iovm_start)
+ size_t size, size_t align, pgprot_t pgprot, unsigned long iovm_start)
{
return NULL;
}
@@ -234,6 +234,10 @@ static inline void tegra_iovmm_zap_vm(struct tegra_iovmm_area *vm) { }
static inline void tegra_iovmm_unzap_vm(struct tegra_iovmm_area *vm) { }
static inline void tegra_iovmm_free_vm(struct tegra_iovmm_area *vm) { }
+static inline size_t tegra_iovmm_get_max_free(struct tegra_iovmm_client *client)
+{
+ return 0;
+}
static inline void tegra_iovmm_vm_insert_pfn(struct tegra_iovmm_area *area,
tegra_iovmm_addr_t vaddr, unsigned long pfn) { }