Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/aegl/linux * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: efivars: add missing parameter to efi_pstore_read()
mariux64 · Nov 29, 2011 · 8748dfa · 8748dfa
2 parents a34815b + eee628d
commit 8748dfa
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
@@ -581,7 +581,8 @@ static int efi_pstore_close(struct pstore_info *psi)
 }
 
 static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,
-			       struct timespec *time, struct pstore_info *psi)
+			       struct timespec *timespec,
+			       char **buf, struct pstore_info *psi)
 {
 	return -1;
 }