diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 21:30:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 21:30:20 -0400 |
| commit | e371d46ae45488bcb112a99a7de462e9e3aa6764 (patch) | |
| tree | 9e2eceb292018e52304053bd8013cdb0a7f31dcc /drivers/pci | |
| parent | b0189cd087aa82bd23277cb5c8960ab030e13e5c (diff) | |
| parent | e57712ebebbb9db7d8dcef216437b3171ddcf115 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
merge fchmod() and fchmodat() guts, kill ancient broken kludge
xfs: fix misspelled S_IS...()
xfs: get rid of open-coded S_ISREG(), etc.
vfs: document locking requirements for d_move, __d_move and d_materialise_unique
omfs: fix (mode & S_IFDIR) abuse
btrfs: S_ISREG(mode) is not mode & S_IFREG...
ima: fmode_t misspelled as mode_t...
pci-label.c: size_t misspelled as mode_t
jffs2: S_ISLNK(mode & S_IFMT) is pointless
snd_msnd ->mode is fmode_t, not mode_t
v9fs_iop_get_acl: get rid of unused variable
vfs: dont chain pipe/anon/socket on superblock s_inodes list
Documentation: Exporting: update description of d_splice_alias
fs: add missing unlock in default_llseek()
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-label.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c index 77cb2a14c896..81525ae5d869 100644 --- a/drivers/pci/pci-label.c +++ b/drivers/pci/pci-label.c | |||
| @@ -55,7 +55,7 @@ enum smbios_attr_enum { | |||
| 55 | SMBIOS_ATTR_INSTANCE_SHOW, | 55 | SMBIOS_ATTR_INSTANCE_SHOW, |
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | static mode_t | 58 | static size_t |
| 59 | find_smbios_instance_string(struct pci_dev *pdev, char *buf, | 59 | find_smbios_instance_string(struct pci_dev *pdev, char *buf, |
| 60 | enum smbios_attr_enum attribute) | 60 | enum smbios_attr_enum attribute) |
| 61 | { | 61 | { |