f8c03aba9ba5b35ece04521133a195247e655adf
[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-2.6.23 / 240-ohci-ssb-pm.patch
1 From: Al Viro <viro@ftp.linux.org.uk>
2 Date: Sat, 13 Oct 2007 21:29:47 +0000 (+0100)
3 Subject: Fix ohci-ssb with !CONFIG_PM
4 X-Git-Tag: linux-2.6.24-rc1~57^2~38
5 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fralf%2Flinux.git;a=commitdiff_plain;h=4735b37cf434175c2b7b36b3b68f1e60e8ec8527;hp=d773b33972a663cfaf066e966f87922a74088a1e
6
7 Fix ohci-ssb with !CONFIG_PM
8
9 ohci_bus_{suspend,resume} exists only if we have CONFIG_PM; do the same
10 thing as other subdrivers...
11
12 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
13 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 ---
15
16 Index: linux-2.6.23.17/drivers/usb/host/ohci-ssb.c
17 ===================================================================
18 --- linux-2.6.23.17.orig/drivers/usb/host/ohci-ssb.c
19 +++ linux-2.6.23.17/drivers/usb/host/ohci-ssb.c
20 @@ -117,8 +117,10 @@ static const struct hc_driver ssb_ohci_h
21 .hub_status_data = ohci_hub_status_data,
22 .hub_control = ohci_hub_control,
23 .hub_irq_enable = ohci_rhsc_enable,
24 +#ifdef CONFIG_PM
25 .bus_suspend = ohci_bus_suspend,
26 .bus_resume = ohci_bus_resume,
27 +#endif
28
29 .start_port_reset = ohci_start_port_reset,
30 };