diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/pci/pci-sysfs.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
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) |