summaryrefslogtreecommitdiffstats
path: root/include/linux/usb.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2008-07-02 21:46:22 +0200
committerGreg Kroah-Hartman2008-07-22 00:15:46 +0200
commit1b26da1510c02a2dac33c0ea48904256dcec4617 (patch)
tree374c8aa6f6283199e51ad83eff6dd239fd543060 /include/linux/usb.h
parentUSB: storage: UNUSUAL_DEVS() for PanDigital Picture frame. (diff)
downloadkernel-qcow2-linux-1b26da1510c02a2dac33c0ea48904256dcec4617.tar.gz
kernel-qcow2-linux-1b26da1510c02a2dac33c0ea48904256dcec4617.tar.xz
kernel-qcow2-linux-1b26da1510c02a2dac33c0ea48904256dcec4617.zip
USB: handle pci_name() being const
This changes usb_create_hcd() to be able to handle the fact that pci_name() has changed to a constant string. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r--include/linux/usb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h
index c08689ea9b4b..cee7fbb2b605 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -293,7 +293,7 @@ struct usb_devmap {
struct usb_bus {
struct device *controller; /* host/master side hardware */
int busnum; /* Bus number (in order of reg) */
- char *bus_name; /* stable id (PCI slot_name etc) */
+ const char *bus_name; /* stable id (PCI slot_name etc) */
u8 uses_dma; /* Does the host controller use DMA? */
u8 otg_port; /* 0, or number of OTG/HNP port */
unsigned is_b_host:1; /* true during some HNP roleswitches */