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 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
sh
/
include
/
asm
/
irqflags.h
diff --git
a/arch/sh/include/asm/irqflags.h
b/arch/sh/include/asm/irqflags.h
index
a741153
..
43b7608
100644
(file)
--- a/
arch/sh/include/asm/irqflags.h
+++ b/
arch/sh/include/asm/irqflags.h
@@
-1,8
+1,8
@@
#ifndef __ASM_SH_IRQFLAGS_H
#define __ASM_SH_IRQFLAGS_H
-#define
RAW_IRQ_DISABLED
0xf0
-#define
RAW_IRQ_ENABLED
0x00
+#define
ARCH_IRQ_DISABLED
0xf0
+#define
ARCH_IRQ_ENABLED
0x00
#include <asm-generic/irqflags.h>