Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 339589
b: refs/heads/master
c: 9364073
h: refs/heads/master
i:
  339587: 9a0ac7c
v: v3
  • Loading branch information
Kevin Hilman authored and Tony Lindgren committed Nov 15, 2012
1 parent 4c19f2b commit 3b875ea
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 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: b1d2037a6c3c754ef7f527249ab2e1dee51e73dd
refs/heads/master: 936407358759adb302df93ab61fa68141897270c
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-omap2/omap-smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

#define OMAP5_CORE_COUNT 0x2

u16 pm44xx_errata;

/* SCU base address */
static void __iomem *scu_base;

Expand Down
1 change: 0 additions & 1 deletion trunk/arch/arm/mach-omap2/pm44xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ struct power_state {
};

static LIST_HEAD(pwrst_list);
u16 pm44xx_errata;

#ifdef CONFIG_SUSPEND
static int omap4_pm_suspend(void)
Expand Down

0 comments on commit 3b875ea

Please sign in to comment.