Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281667
b: refs/heads/master
c: 6cc04a4
h: refs/heads/master
i:
  281665: 6d4e5b9
  281663: edf0926
v: v3
  • Loading branch information
Stephen Warren authored and Olof Johansson committed Dec 20, 2011
1 parent efb9fdc commit 7408735
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 24692c0fc6ee62b1b98dfab962694ca40a3e404a
refs/heads/master: 6cc04a4420391c3f034afe8ea6e28d75912a70a3
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-tegra/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;

#ifdef CONFIG_OF
static const struct of_device_id tegra_dt_irq_match[] __initconst = {
{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init },
{ }
Expand All @@ -45,6 +46,7 @@ void __init tegra_dt_init_irq(void)
tegra_init_irq();
of_irq_init(tegra_dt_irq_match);
}
#endif

void tegra_assert_system_reset(char mode, const char *cmd)
{
Expand Down

0 comments on commit 7408735

Please sign in to comment.