amd64: fix get_user() on bitwise

[linux-2.6] / include / asm-sh / hw_irq.h

diff --git a/include/asm-sh/hw_irq.h b/include/asm-sh/hw_irq.h
index 34ff8c7cfb55774f18787a291ee18afb1a18c481..20d42959f52ad25d3da5a7c5824b03a96cbffb73 100644 (file)
--- a/include/asm-sh/hw_irq.h
+++ b/include/asm-sh/hw_irq.h
@@ -23,7 +23,6 @@ struct intc2_desc {
 };
 
 void register_intc2_controller(struct intc2_desc *);
-void init_IRQ_intc2(void);
 
 struct ipr_data {
        unsigned char irq;
@@ -41,12 +40,11 @@ struct ipr_desc {
 };
 
 void register_ipr_controller(struct ipr_desc *);
-void init_IRQ_ipr(void);
 
 /*
  * Enable individual interrupt mode for external IPR IRQs.
  */
-void ipr_irq_enable_irlm(void);
+void __init ipr_irq_enable_irlm(void);
 
 typedef unsigned char intc_enum;
 
@@ -105,7 +103,7 @@ struct intc_desc {
 #define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a)
 #define DECLARE_INTC_DESC(symbol, chipname, vectors, groups,           \
        priorities, mask_regs, prio_regs, sense_regs)                   \
-static struct intc_desc symbol = {                                     \
+struct intc_desc symbol = {                                            \
        _INTC_ARRAY(vectors), _INTC_ARRAY(groups),                      \
        _INTC_ARRAY(priorities),                                        \
        _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs),                 \
@@ -115,4 +113,9 @@ static struct intc_desc symbol = {                                  \
 
 void __init register_intc_controller(struct intc_desc *desc);
 
+void __init plat_irq_setup(void);
+
+enum { IRQ_MODE_IRQ, IRQ_MODE_IRL7654, IRQ_MODE_IRL3210 };
+void __init plat_irq_setup_pins(int mode);
+
 #endif /* __ASM_SH_HW_IRQ_H */