Commit 8748dfae authored by Linus Torvalds's avatar Linus Torvalds

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()
parents a34815b9 eee628da
...@@ -581,7 +581,8 @@ static int efi_pstore_close(struct pstore_info *psi) ...@@ -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, 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; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment