X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=arch%2Fia64%2Finclude%2Fasm%2Firq.h;h=91b920fd7d534099073c1ca44c69938cc445c9d4;hb=aac3d39693529ca538e37ebdb6ed5d6432a697c7;hp=36429a5326302f4497893fae67d7dfb88dea916e;hpb=9d7eff608dbccceb3a5168bd240dc6262ae42459;p=cascardo%2Flinux.git

diff --git a/arch/ia64/include/asm/irq.h b/arch/ia64/include/asm/irq.h
index 36429a532630..91b920fd7d53 100644
--- a/arch/ia64/include/asm/irq.h
+++ b/arch/ia64/include/asm/irq.h
@@ -13,7 +13,7 @@
 
 #include <linux/types.h>
 #include <linux/cpumask.h>
-#include <asm-ia64/nr-irqs.h>
+#include <generated/nr-irqs.h>
 
 static __inline__ int
 irq_canonicalize (int irq)
@@ -27,7 +27,7 @@ irq_canonicalize (int irq)
 }
 
 extern void set_irq_affinity_info (unsigned int irq, int dest, int redir);
-bool is_affinity_mask_valid(cpumask_var_t cpumask);
+bool is_affinity_mask_valid(const struct cpumask *cpumask);
 
 #define is_affinity_mask_valid is_affinity_mask_valid