Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259125
b: refs/heads/master
c: e48f7eb
h: refs/heads/master
i:
  259123: 4ae00da
v: v3
  • Loading branch information
Dmitry Eremin-Solenikov authored and Benjamin Herrenschmidt committed Jun 29, 2011
1 parent 7cc23a9 commit 3568855
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 3d41e0f6d91cedcab08dff2f5e148b20c87a7432
refs/heads/master: e48f7eb27f0e38e1a461fa4e43025d18100d250b
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/kernel/misc_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ _GLOBAL(real_205_writeb)
#endif /* CONFIG_PPC_PASEMI */


#ifdef CONFIG_CPU_FREQ_PMAC64
#if defined(CONFIG_CPU_FREQ_PMAC64) || defined(CONFIG_CPU_FREQ_MAPLE)
/*
* SCOM access functions for 970 (FX only for now)
*
Expand Down Expand Up @@ -408,7 +408,7 @@ _GLOBAL(scom970_write)
/* restore interrupts */
mtmsrd r5,1
blr
#endif /* CONFIG_CPU_FREQ_PMAC64 */
#endif /* CONFIG_CPU_FREQ_PMAC64 || CONFIG_CPU_FREQ_MAPLE */


/*
Expand Down

0 comments on commit 3568855

Please sign in to comment.