diff options
Diffstat (limited to 'include/asm-v850')
-rw-r--r-- | include/asm-v850/hw_irq.h | 4 | ||||
-rw-r--r-- | include/asm-v850/irq.h | 2 | ||||
-rw-r--r-- | include/asm-v850/signal.h | 2 | ||||
-rw-r--r-- | include/asm-v850/socket.h | 1 |
4 files changed, 1 insertions, 8 deletions
diff --git a/include/asm-v850/hw_irq.h b/include/asm-v850/hw_irq.h index a8aab4342712..043e94bb6bd8 100644 --- a/include/asm-v850/hw_irq.h +++ b/include/asm-v850/hw_irq.h | |||
@@ -1,8 +1,4 @@ | |||
1 | #ifndef __V850_HW_IRQ_H__ | 1 | #ifndef __V850_HW_IRQ_H__ |
2 | #define __V850_HW_IRQ_H__ | 2 | #define __V850_HW_IRQ_H__ |
3 | 3 | ||
4 | static inline void hw_resend_irq (struct hw_interrupt_type *h, unsigned int i) | ||
5 | { | ||
6 | } | ||
7 | |||
8 | #endif /* __V850_HW_IRQ_H__ */ | 4 | #endif /* __V850_HW_IRQ_H__ */ |
diff --git a/include/asm-v850/irq.h b/include/asm-v850/irq.h index 44431152b36d..1bf096db8f4c 100644 --- a/include/asm-v850/irq.h +++ b/include/asm-v850/irq.h | |||
@@ -62,8 +62,6 @@ extern void disable_irq (unsigned int irq); | |||
62 | /* Disable an irq without waiting. */ | 62 | /* Disable an irq without waiting. */ |
63 | extern void disable_irq_nosync (unsigned int irq); | 63 | extern void disable_irq_nosync (unsigned int irq); |
64 | 64 | ||
65 | extern int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *); | ||
66 | |||
67 | #endif /* !__ASSEMBLY__ */ | 65 | #endif /* !__ASSEMBLY__ */ |
68 | 66 | ||
69 | #endif /* __V850_IRQ_H__ */ | 67 | #endif /* __V850_IRQ_H__ */ |
diff --git a/include/asm-v850/signal.h b/include/asm-v850/signal.h index cb52caa69925..a38df0834bbf 100644 --- a/include/asm-v850/signal.h +++ b/include/asm-v850/signal.h | |||
@@ -77,7 +77,6 @@ typedef unsigned long sigset_t; | |||
77 | * SA_FLAGS values: | 77 | * SA_FLAGS values: |
78 | * | 78 | * |
79 | * SA_ONSTACK indicates that a registered stack_t will be used. | 79 | * SA_ONSTACK indicates that a registered stack_t will be used. |
80 | * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the | ||
81 | * SA_RESTART flag to get restarting signals (which were the default long ago) | 80 | * SA_RESTART flag to get restarting signals (which were the default long ago) |
82 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. | 81 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. |
83 | * SA_RESETHAND clears the handler when the signal is delivered. | 82 | * SA_RESETHAND clears the handler when the signal is delivered. |
@@ -97,7 +96,6 @@ typedef unsigned long sigset_t; | |||
97 | 96 | ||
98 | #define SA_NOMASK SA_NODEFER | 97 | #define SA_NOMASK SA_NODEFER |
99 | #define SA_ONESHOT SA_RESETHAND | 98 | #define SA_ONESHOT SA_RESETHAND |
100 | #define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ | ||
101 | 99 | ||
102 | #define SA_RESTORER 0x04000000 | 100 | #define SA_RESTORER 0x04000000 |
103 | 101 | ||
diff --git a/include/asm-v850/socket.h b/include/asm-v850/socket.h index 0240d366a0a4..0dfe55ac2ef2 100644 --- a/include/asm-v850/socket.h +++ b/include/asm-v850/socket.h | |||
@@ -48,5 +48,6 @@ | |||
48 | #define SO_ACCEPTCONN 30 | 48 | #define SO_ACCEPTCONN 30 |
49 | 49 | ||
50 | #define SO_PEERSEC 31 | 50 | #define SO_PEERSEC 31 |
51 | #define SO_PASSSEC 34 | ||
51 | 52 | ||
52 | #endif /* __V850_SOCKET_H__ */ | 53 | #endif /* __V850_SOCKET_H__ */ |