Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 22971
b: refs/heads/master
c: 57ae595
h: refs/heads/master
i:
  22969: a5226d3
  22967: 5afd10e
v: v3
  • Loading branch information
Andrew Morton authored and Paul Mackerras committed Mar 23, 2006
1 parent 7cbc1f2 commit 9c2095d
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: 3e52174ec8fd9d8671b69b8e7decb465aaf519c0
refs/heads/master: 57ae595f6bf8bde42de199ff9fe68b873080fde2
2 changes: 2 additions & 0 deletions trunk/drivers/macintosh/via-pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ static int drop_interrupts;
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
static int option_lid_wakeup = 1;
#endif /* CONFIG_PM && CONFIG_PPC32 */
#if (defined(CONFIG_PM)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT)
static int sleep_in_progress;
#endif
static unsigned long async_req_locks;
static unsigned int pmu_irq_stats[11];

Expand Down

0 comments on commit 9c2095d

Please sign in to comment.