diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 03:18:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 03:18:39 -0400 |
| commit | f48d1915b86f06a943087e5f9b29542a1ef4cd4d (patch) | |
| tree | 86b5d8c7e971c684aa726faa20dbf415d3a742d5 /drivers/firmware | |
| parent | f673b7c2c5c79ec239aca504452d2584b0bad34a (diff) | |
| parent | b728a5c806fb36f9adebf2a862bbd015e074afca (diff) | |
Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
efivars: fix warnings when CONFIG_PSTORE=n
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/efivars.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index eacb05e6cfb3..eb80b549ed8d 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c | |||
| @@ -157,7 +157,7 @@ utf16_strnlen(efi_char16_t *s, size_t maxlength) | |||
| 157 | return length; | 157 | return length; |
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | static unsigned long | 160 | static inline unsigned long |
| 161 | utf16_strlen(efi_char16_t *s) | 161 | utf16_strlen(efi_char16_t *s) |
| 162 | { | 162 | { |
| 163 | return utf16_strnlen(s, ~0UL); | 163 | return utf16_strnlen(s, ~0UL); |
| @@ -580,8 +580,8 @@ static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type, | |||
| 580 | return -1; | 580 | return -1; |
| 581 | } | 581 | } |
| 582 | 582 | ||
| 583 | static u64 efi_pstore_write(enum pstore_type_id type, int part, size_t size, | 583 | static u64 efi_pstore_write(enum pstore_type_id type, unsigned int part, |
| 584 | struct pstore_info *psi) | 584 | size_t size, struct pstore_info *psi) |
| 585 | { | 585 | { |
| 586 | return 0; | 586 | return 0; |
| 587 | } | 587 | } |