diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:48 -0400 |
commit | 5fb55ae955cee254f9e3b45636266a4855bb88a5 (patch) | |
tree | 26a41aed39c7476ca06bb2fe697b6c662f7d9427 /include | |
parent | dacdb3b23a918d52ff52708b25d6d45dab7ea14b (diff) |
[PATCH] irq-flags: SH64: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-sh64/keyboard.h | 2 | ||||
-rw-r--r-- | include/asm-sh64/signal.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-sh64/keyboard.h b/include/asm-sh64/keyboard.h index 733e2bbe7b8c..1fab96d792bf 100644 --- a/include/asm-sh64/keyboard.h +++ b/include/asm-sh64/keyboard.h | |||
@@ -65,7 +65,7 @@ extern unsigned char pckbd_sysrq_xlate[128]; | |||
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | #define aux_request_irq(hand, dev_id) \ | 67 | #define aux_request_irq(hand, dev_id) \ |
68 | request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS2 Mouse", dev_id) | 68 | request_irq(AUX_IRQ, hand, IRQF_SHARED, "PS2 Mouse", dev_id) |
69 | 69 | ||
70 | #define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id) | 70 | #define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id) |
71 | 71 | ||
diff --git a/include/asm-sh64/signal.h b/include/asm-sh64/signal.h index 2400dc688a65..a5a28203cb3b 100644 --- a/include/asm-sh64/signal.h +++ b/include/asm-sh64/signal.h | |||
@@ -74,7 +74,6 @@ typedef struct { | |||
74 | * SA_FLAGS values: | 74 | * SA_FLAGS values: |
75 | * | 75 | * |
76 | * SA_ONSTACK indicates that a registered stack_t will be used. | 76 | * SA_ONSTACK indicates that a registered stack_t will be used. |
77 | * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the | ||
78 | * SA_RESTART flag to get restarting signals (which were the default long ago) | 77 | * SA_RESTART flag to get restarting signals (which were the default long ago) |
79 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. | 78 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. |
80 | * SA_RESETHAND clears the handler when the signal is delivered. | 79 | * SA_RESETHAND clears the handler when the signal is delivered. |
@@ -94,7 +93,6 @@ typedef struct { | |||
94 | 93 | ||
95 | #define SA_NOMASK SA_NODEFER | 94 | #define SA_NOMASK SA_NODEFER |
96 | #define SA_ONESHOT SA_RESETHAND | 95 | #define SA_ONESHOT SA_RESETHAND |
97 | #define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ | ||
98 | 96 | ||
99 | #define SA_RESTORER 0x04000000 | 97 | #define SA_RESTORER 0x04000000 |
100 | 98 | ||