diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 17:37:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 17:37:27 -0400 |
| commit | e36f561a2c88394ef2708f1ab300fe8a79e9f651 (patch) | |
| tree | 385f378c4240955e4356d49686a8ef606a82a7c1 /arch/sh/include/asm/irqflags.h | |
| parent | 70ada77920723fbc2b35e9b301022fb1e166b41b (diff) | |
| parent | df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags:
Fix IRQ flag handling naming
MIPS: Add missing #inclusions of <linux/irq.h>
smc91x: Add missing #inclusion of <linux/irq.h>
Drop a couple of unnecessary asm/system.h inclusions
SH: Add missing consts to sys_execve() declaration
Blackfin: Rename IRQ flags handling functions
Blackfin: Add missing dep to asm/irqflags.h
Blackfin: Rename DES PC2() symbol to avoid collision
Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header
Blackfin: Split PLL code from mach-specific cdef headers
Diffstat (limited to 'arch/sh/include/asm/irqflags.h')
| -rw-r--r-- | arch/sh/include/asm/irqflags.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/irqflags.h b/arch/sh/include/asm/irqflags.h index a741153b41c2..43b7608606c3 100644 --- a/arch/sh/include/asm/irqflags.h +++ b/arch/sh/include/asm/irqflags.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | #ifndef __ASM_SH_IRQFLAGS_H | 1 | #ifndef __ASM_SH_IRQFLAGS_H |
| 2 | #define __ASM_SH_IRQFLAGS_H | 2 | #define __ASM_SH_IRQFLAGS_H |
| 3 | 3 | ||
| 4 | #define RAW_IRQ_DISABLED 0xf0 | 4 | #define ARCH_IRQ_DISABLED 0xf0 |
| 5 | #define RAW_IRQ_ENABLED 0x00 | 5 | #define ARCH_IRQ_ENABLED 0x00 |
| 6 | 6 | ||
| 7 | #include <asm-generic/irqflags.h> | 7 | #include <asm-generic/irqflags.h> |
| 8 | 8 | ||