1 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 2aea5d22db07..c91171599cb6 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -93,27 +93,27 @@ typedef irqreturn_t (*irq_handler_t)(int, void *);
 /**
  * struct irqaction - per interrupt action descriptor
  * @handler:    interrupt handler function
- * @flags:      flags (see IRQF_* above)
  * @name:       name of the device
  * @dev_id:     cookie to identify the device
  * @percpu_dev_id:      cookie to identify the device
  * @next:       pointer to the next irqaction for shared interrupts
  * @irq:        interrupt number
- * @dir:        pointer to the proc/irq/NN/name entry
+ * @flags:      flags (see IRQF_* above)
  * @thread_fn:  interrupt handler function for threaded interrupts
  * @thread:     thread pointer for threaded interrupts
  * @thread_flags:       flags related to @thread
  * @thread_mask:        bitmask for keeping track of @thread activity
+ * @dir:        pointer to the proc/irq/NN/name entry
  */
 struct irqaction {
         irq_handler_t           handler;
-        unsigned long           flags;
         void                    *dev_id;
         void __percpu           *percpu_dev_id;
         struct irqaction        *next;
-        int                     irq;
         irq_handler_t           thread_fn;
         struct task_struct      *thread;
+        unsigned int            irq;
+        unsigned int            flags;
         unsigned long           thread_flags;
         unsigned long           thread_mask;
         const char              *name;