summaryrefslogtreecommitdiff
path: root/drivers/pci/slot.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-09-10 01:38:43 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-09-10 01:38:43 +0400
commitde9ea203d105f760e8e995c07aa80e855a9aedba (patch)
tree75e4702e98a0b3ea9ed6d085f74474a70642909b /drivers/pci/slot.c
parent2be23c475af8ae4e25f8bab08d815b17593bd547 (diff)
parentd56557af19867edb8c0e96f8e26399698a08857f (diff)
downloadlinux-de9ea203d105f760e8e995c07aa80e855a9aedba.tar.xz
Merge branch 'origin'
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 659eaa0fc48f..968cfea04f74 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -49,7 +49,7 @@ static ssize_t address_read_file(struct pci_slot *slot, char *buf)
}
/* these strings match up with the values in pci_bus_speed */
-static char *pci_bus_speed_strings[] = {
+static const char *pci_bus_speed_strings[] = {
"33 MHz PCI", /* 0x00 */
"66 MHz PCI", /* 0x01 */
"66 MHz PCI-X", /* 0x02 */