Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235269
b: refs/heads/master
c: dc54c23
h: refs/heads/master
i:
  235267: 6742d3f
v: v3
  • Loading branch information
Stephen Warren authored and Colin Cross committed Feb 23, 2011
1 parent 47ecd26 commit 617182e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 48e5114d6f4cade466b127c6aad09769a574b557
refs/heads/master: dc54c23bb0e29de1bcaa40dbeffbc6cac641fb22
4 changes: 0 additions & 4 deletions trunk/arch/arm/mach-tegra/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <asm/hardware/cache-l2x0.h>

#include <mach/iomap.h>
#include <mach/dma.h>
#include <mach/system.h>

#include "board.h"
Expand Down Expand Up @@ -81,7 +80,4 @@ void __init tegra_init_early(void)
tegra_init_clock();
tegra_clk_init_from_table(common_clk_init_table);
tegra_init_cache();
#ifdef CONFIG_TEGRA_SYSTEM_DMA
tegra_dma_init();
#endif
}
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-tegra/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,7 @@ int __init tegra_dma_init(void)
}
return ret;
}
postcore_initcall(tegra_dma_init);

#ifdef CONFIG_PM
static u32 apb_dma[5*TEGRA_SYSTEM_DMA_CH_NR + 3];
Expand Down

0 comments on commit 617182e

Please sign in to comment.