diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-02 15:46:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 18:15:46 -0400 |
commit | 1b26da1510c02a2dac33c0ea48904256dcec4617 (patch) | |
tree | 374c8aa6f6283199e51ad83eff6dd239fd543060 /drivers/usb/core | |
parent | c5e46007e9737b77a79ec79ed95262c0ce996d6a (diff) |
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 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/hcd.c | 2 | ||||
-rw-r--r-- | drivers/usb/core/hcd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 42a436478b78..07f7bedf4dca 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -1764,7 +1764,7 @@ EXPORT_SYMBOL_GPL (usb_hc_died); | |||
1764 | * If memory is unavailable, returns NULL. | 1764 | * If memory is unavailable, returns NULL. |
1765 | */ | 1765 | */ |
1766 | struct usb_hcd *usb_create_hcd (const struct hc_driver *driver, | 1766 | struct usb_hcd *usb_create_hcd (const struct hc_driver *driver, |
1767 | struct device *dev, char *bus_name) | 1767 | struct device *dev, const char *bus_name) |
1768 | { | 1768 | { |
1769 | struct usb_hcd *hcd; | 1769 | struct usb_hcd *hcd; |
1770 | 1770 | ||
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h index b9de1569b39e..50b8bb2d1212 100644 --- a/drivers/usb/core/hcd.h +++ b/drivers/usb/core/hcd.h | |||
@@ -235,7 +235,7 @@ extern void usb_hcd_disable_endpoint(struct usb_device *udev, | |||
235 | extern int usb_hcd_get_frame_number(struct usb_device *udev); | 235 | extern int usb_hcd_get_frame_number(struct usb_device *udev); |
236 | 236 | ||
237 | extern struct usb_hcd *usb_create_hcd(const struct hc_driver *driver, | 237 | extern struct usb_hcd *usb_create_hcd(const struct hc_driver *driver, |
238 | struct device *dev, char *bus_name); | 238 | struct device *dev, const char *bus_name); |
239 | extern struct usb_hcd *usb_get_hcd(struct usb_hcd *hcd); | 239 | extern struct usb_hcd *usb_get_hcd(struct usb_hcd *hcd); |
240 | extern void usb_put_hcd(struct usb_hcd *hcd); | 240 | extern void usb_put_hcd(struct usb_hcd *hcd); |
241 | extern int usb_add_hcd(struct usb_hcd *hcd, | 241 | extern int usb_add_hcd(struct usb_hcd *hcd, |