summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/include/mach/tegra_das.h1
-rw-r--r--arch/arm/mach-tegra/tegra_das.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/include/mach/tegra_das.h b/arch/arm/mach-tegra/include/mach/tegra_das.h
index 27e73254376c..473456c6186b 100644
--- a/arch/arm/mach-tegra/include/mach/tegra_das.h
+++ b/arch/arm/mach-tegra/include/mach/tegra_das.h
@@ -140,6 +140,7 @@ enum dac_dap_data_format {
dac_dap_data_format_dsp = 0x2,
dac_dap_data_format_rjm = 0x4,
dac_dap_data_format_ljm = 0x8,
+ dac_dap_data_format_tdm = 0x10,
dac_dap_data_format_all = 0x7FFFFFFF
};
diff --git a/arch/arm/mach-tegra/tegra_das.c b/arch/arm/mach-tegra/tegra_das.c
index a4676d3750b1..dfc66e5126a4 100644
--- a/arch/arm/mach-tegra/tegra_das.c
+++ b/arch/arm/mach-tegra/tegra_das.c
@@ -342,7 +342,6 @@ static int das_set_con_end_points(u32 src_idx, u32 dest_idx, bool is_src_master)
return 0;
}
-
int tegra_das_set_connection(enum tegra_das_port_con_id new_con_id)
{
int i;