diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-01 17:00:08 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-01 17:00:08 +0530 |
| commit | 677368f44ce65fe2292f696f0bfd568d3ac78436 (patch) | |
| tree | e8317363967fbeef2680f4bca50bbda970d17f61 /arch/arm/mach-tegra/include | |
| parent | a8a882acd1b12930328b0090ff40a984f754eda6 (diff) | |
| parent | 17a2400a982bbf7aaabe89d7bacf32f600d4e751 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
drivers/serial/tegra_hsuart.c
drivers/usb/host/ehci-tegra.c
Change-Id: Ief6c03a63615a41e85de59ad14dedef309d0b2fb
Diffstat (limited to 'arch/arm/mach-tegra/include')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/dma.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/include/mach/dma.h b/arch/arm/mach-tegra/include/mach/dma.h index cb0248cca615..257367980614 100644 --- a/arch/arm/mach-tegra/include/mach/dma.h +++ b/arch/arm/mach-tegra/include/mach/dma.h @@ -142,7 +142,6 @@ int tegra_dma_enqueue_req(struct tegra_dma_channel *ch, struct tegra_dma_req *req); int tegra_dma_dequeue_req(struct tegra_dma_channel *ch, struct tegra_dma_req *req); -void tegra_dma_dequeue(struct tegra_dma_channel *ch); void tegra_dma_flush(struct tegra_dma_channel *ch); bool tegra_dma_is_req_inflight(struct tegra_dma_channel *ch, |