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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
alpha
/
include
/
asm
/
core_mcpcia.h
diff --git
a/arch/alpha/include/asm/core_mcpcia.h
b/arch/alpha/include/asm/core_mcpcia.h
index
21ac533
..
9f67a05
100644
(file)
--- a/
arch/alpha/include/asm/core_mcpcia.h
+++ b/
arch/alpha/include/asm/core_mcpcia.h
@@
-247,7
+247,7
@@
struct el_MCPCIA_uncorrected_frame_mcheck {
#define vip volatile int __force *
#define vuip volatile unsigned int __force *
-#ifdef MCPCIA_ONE_HAE_WINDOW
+#if
n
def MCPCIA_ONE_HAE_WINDOW
#define MCPCIA_FROB_MMIO \
if (__mcpcia_is_mmio(hose)) { \
set_hae(hose & 0xffffffff); \