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
/
microblaze
/
include
/
asm
/
irqflags.h
diff --git
a/arch/microblaze/include/asm/irqflags.h
b/arch/microblaze/include/asm/irqflags.h
index
5fd3190
..
c4532f0
100644
(file)
--- a/
arch/microblaze/include/asm/irqflags.h
+++ b/
arch/microblaze/include/asm/irqflags.h
@@
-12,7
+12,7
@@
#include <linux/types.h>
#include <asm/registers.h>
-#if
def
CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
+#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
static inline unsigned long arch_local_irq_save(void)
{