diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/pci/pci-sysfs.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/pci/pci-sysfs.c')
| -rw-r--r-- | drivers/pci/pci-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index a8a277a2e0d0..f8deb3e380a2 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
| @@ -645,7 +645,7 @@ pci_adjust_legacy_attr(struct pci_bus *b, enum pci_mmap_state mmap_type) | |||
| 645 | * a per-bus basis. This routine creates the files and ties them into | 645 | * a per-bus basis. This routine creates the files and ties them into |
| 646 | * their associated read, write and mmap files from pci-sysfs.c | 646 | * their associated read, write and mmap files from pci-sysfs.c |
| 647 | * | 647 | * |
| 648 | * On error unwind, but don't propogate the error to the caller | 648 | * On error unwind, but don't propagate the error to the caller |
| 649 | * as it is ok to set up the PCI bus without these files. | 649 | * as it is ok to set up the PCI bus without these files. |
| 650 | */ | 650 | */ |
| 651 | void pci_create_legacy_files(struct pci_bus *b) | 651 | void pci_create_legacy_files(struct pci_bus *b) |