diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/pci/pci-sysfs.c | |
parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.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 a8a277a2e0d..f8deb3e380a 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) |