git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
qe.h
diff --git
a/arch/powerpc/include/asm/qe.h
b/arch/powerpc/include/asm/qe.h
index
5e0b6d5
..
360abc6
100644
(file)
--- a/
arch/powerpc/include/asm/qe.h
+++ b/
arch/powerpc/include/asm/qe.h
@@
-193,6
+193,7
@@
static inline int qe_alive_during_sleep(void)
#define qe_muram_free cpm_muram_free
#define qe_muram_addr cpm_muram_addr
#define qe_muram_offset cpm_muram_offset
+#define qe_muram_dma cpm_muram_dma
/* Structure that defines QE firmware binary files.
*