[PATCH] USB: fix pm patches with CONFIG_PM off part 1
With CONFIG_PM=n: drivers/built-in.o(.text+0x2a69c): In function `ohci_hub_control': drivers/usb/host/ohci-hub.c:539: undefined reference to `.usb_hcd_resume_root_hub' drivers/built-in.o(.text+0x2b920): In function `ohci_irq': drivers/usb/host/ohci-hcd.c:726: undefined reference to `.usb_hcd_resume_root_hub' Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Родитель
4f62efe67f
Коммит
db2d55b7f7
|
@ -351,9 +351,6 @@ extern long usb_calc_bus_time (int speed, int is_input,
|
||||||
|
|
||||||
extern struct usb_bus *usb_alloc_bus (struct usb_operations *);
|
extern struct usb_bus *usb_alloc_bus (struct usb_operations *);
|
||||||
|
|
||||||
extern void usb_hcd_suspend_root_hub (struct usb_hcd *hcd);
|
|
||||||
extern void usb_hcd_resume_root_hub (struct usb_hcd *hcd);
|
|
||||||
|
|
||||||
extern void usb_set_device_state(struct usb_device *udev,
|
extern void usb_set_device_state(struct usb_device *udev,
|
||||||
enum usb_device_state new_state);
|
enum usb_device_state new_state);
|
||||||
|
|
||||||
|
@ -376,9 +373,21 @@ extern int usb_find_interface_driver (struct usb_device *dev,
|
||||||
#define usb_endpoint_out(ep_dir) (!((ep_dir) & USB_DIR_IN))
|
#define usb_endpoint_out(ep_dir) (!((ep_dir) & USB_DIR_IN))
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
|
extern void usb_hcd_suspend_root_hub (struct usb_hcd *hcd);
|
||||||
|
extern void usb_hcd_resume_root_hub (struct usb_hcd *hcd);
|
||||||
extern int hcd_bus_suspend (struct usb_bus *bus);
|
extern int hcd_bus_suspend (struct usb_bus *bus);
|
||||||
extern int hcd_bus_resume (struct usb_bus *bus);
|
extern int hcd_bus_resume (struct usb_bus *bus);
|
||||||
#else
|
#else
|
||||||
|
static inline void usb_hcd_suspend_root_hub(struct usb_hcd *hcd)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
static inline int hcd_bus_suspend(struct usb_bus *bus)
|
static inline int hcd_bus_suspend(struct usb_bus *bus)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче