diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
| commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
| tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /drivers/pci/access.c | |
| parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
| parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) | |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/pci/access.c')
| -rw-r--r-- | drivers/pci/access.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c index 64dd7df90e62..0f3706512686 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c | |||
| @@ -87,8 +87,8 @@ EXPORT_SYMBOL(pci_read_vpd); | |||
| 87 | * pci_write_vpd - Write entry to Vital Product Data | 87 | * pci_write_vpd - Write entry to Vital Product Data |
| 88 | * @dev: pci device struct | 88 | * @dev: pci device struct |
| 89 | * @pos: offset in vpd space | 89 | * @pos: offset in vpd space |
| 90 | * @count: number of bytes to read | 90 | * @count: number of bytes to write |
| 91 | * @val: value to write | 91 | * @buf: buffer containing write data |
| 92 | * | 92 | * |
| 93 | */ | 93 | */ |
| 94 | ssize_t pci_write_vpd(struct pci_dev *dev, loff_t pos, size_t count, const void *buf) | 94 | ssize_t pci_write_vpd(struct pci_dev *dev, loff_t pos, size_t count, const void *buf) |