diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 15:43:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 15:43:57 -0500 |
commit | 0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a (patch) | |
tree | 93eefb55eb9a9e41053e6de032e49e92c7be5574 /arch/m68k/include | |
parent | 87f71ae2dd7471c1b4c94100be1f218e91dc64c3 (diff) | |
parent | 2a3535069e33d8b416f406c159ce924427315303 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Fix assembler constraint to prevent overeager gcc optimisation
mac_esp: rename irq
mac_scsi: dont enable mac_scsi irq before requesting it
macfb: fix black and white modes
m68k/irq: Remove obsolete IRQ_FLG_* definitions
Fix up trivial conflict in arch/m68k/kernel/process_mm.c as per Geert.
Diffstat (limited to 'arch/m68k/include')
-rw-r--r-- | arch/m68k/include/asm/irq.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h index 0e89fa05de0e..c1155f0e22cc 100644 --- a/arch/m68k/include/asm/irq.h +++ b/arch/m68k/include/asm/irq.h | |||
@@ -50,19 +50,6 @@ | |||
50 | 50 | ||
51 | #define IRQ_USER 8 | 51 | #define IRQ_USER 8 |
52 | 52 | ||
53 | /* | ||
54 | * various flags for request_irq() - the Amiga now uses the standard | ||
55 | * mechanism like all other architectures - IRQF_DISABLED and | ||
56 | * IRQF_SHARED are your friends. | ||
57 | */ | ||
58 | #ifndef MACH_AMIGA_ONLY | ||
59 | #define IRQ_FLG_LOCK (0x0001) /* handler is not replaceable */ | ||
60 | #define IRQ_FLG_REPLACE (0x0002) /* replace existing handler */ | ||
61 | #define IRQ_FLG_FAST (0x0004) | ||
62 | #define IRQ_FLG_SLOW (0x0008) | ||
63 | #define IRQ_FLG_STD (0x8000) /* internally used */ | ||
64 | #endif | ||
65 | |||
66 | struct irq_data; | 53 | struct irq_data; |
67 | struct irq_chip; | 54 | struct irq_chip; |
68 | struct irq_desc; | 55 | struct irq_desc; |