Merge branch 'fixefi' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/aegl/linux-2.6 * 'fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: efi: Fix argument types for SetVariable() for ia64
mrcsosa · Aug 5, 2011 · 8b6b462 · 8b6b462
2 parents f03683b + 1eb9a4b
commit 8b6b462
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
@@ -156,7 +156,7 @@ prefix##_get_next_variable (unsigned long *name_size, efi_char16_t *name,      \
 #define STUB_SET_VARIABLE(prefix, adjust_arg)				       \
 static efi_status_t							       \
 prefix##_set_variable (efi_char16_t *name, efi_guid_t *vendor,		       \
-		       unsigned long attr, unsigned long data_size,	       \
+		       u32 attr, unsigned long data_size,		       \
 		       void *data)					       \
 {									       \
 	struct ia64_fpreg fr[6];					       \