aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/slot.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-22 13:53:47 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-22 13:53:47 -0500
commite3414786ffb40a1fd524624369d350ed70a90a08 (patch)
treeb4247a5e7c2335e9fa8b2ab6ac57ede3d2576f52 /drivers/pci/slot.c
parentb0e3636f656c98bdeded5aaa78601e3256b18d6d (diff)
parente7cc5cf74544d97d7b69e2701595037474db1f96 (diff)
Merge tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI updates from Bjorn Helgaas: "Miscellaneous - Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu) - Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)" * tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove() PCI: Fix whitespace, capitalization, and spelling errors
Diffstat (limited to 'drivers/pci/slot.c')
-rw-r--r--drivers/pci/slot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index c1e9284a677b..448ca562d1f8 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -53,7 +53,7 @@ static ssize_t address_read_file(struct pci_slot *slot, char *buf)
53static const char *pci_bus_speed_strings[] = { 53static const char *pci_bus_speed_strings[] = {
54 "33 MHz PCI", /* 0x00 */ 54 "33 MHz PCI", /* 0x00 */
55 "66 MHz PCI", /* 0x01 */ 55 "66 MHz PCI", /* 0x01 */
56 "66 MHz PCI-X", /* 0x02 */ 56 "66 MHz PCI-X", /* 0x02 */
57 "100 MHz PCI-X", /* 0x03 */ 57 "100 MHz PCI-X", /* 0x03 */
58 "133 MHz PCI-X", /* 0x04 */ 58 "133 MHz PCI-X", /* 0x04 */
59 NULL, /* 0x05 */ 59 NULL, /* 0x05 */