diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-12-09 16:11:52 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-12-09 16:11:52 +0000 |
| commit | d663a1f1457dd05181a18f2420b8bf7cab678dfb (patch) | |
| tree | 114a7b6c07d73fdeeebca458d1605c8af316c19e /target/linux/brcm47xx/patches-2.6.23/240-ohci-ssb-pm.patch | |
| parent | 92368e2f855f97ee58b35c3a65d3a3fe9bcca6d3 (diff) | |
| download | upstream-d663a1f1457dd05181a18f2420b8bf7cab678dfb.tar.gz upstream-d663a1f1457dd05181a18f2420b8bf7cab678dfb.tar.bz2 upstream-d663a1f1457dd05181a18f2420b8bf7cab678dfb.zip | |
Add bcm5354 patches from #2757
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9685 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.23/240-ohci-ssb-pm.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.23/240-ohci-ssb-pm.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.23/240-ohci-ssb-pm.patch b/target/linux/brcm47xx/patches-2.6.23/240-ohci-ssb-pm.patch new file mode 100644 index 0000000000..81ba45bee8 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.23/240-ohci-ssb-pm.patch @@ -0,0 +1,30 @@ +From: Al Viro <viro@ftp.linux.org.uk> +Date: Sat, 13 Oct 2007 21:29:47 +0000 (+0100) +Subject: Fix ohci-ssb with !CONFIG_PM +X-Git-Tag: linux-2.6.24-rc1~57^2~38 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fralf%2Flinux.git;a=commitdiff_plain;h=4735b37cf434175c2b7b36b3b68f1e60e8ec8527;hp=d773b33972a663cfaf066e966f87922a74088a1e + +Fix ohci-ssb with !CONFIG_PM + +ohci_bus_{suspend,resume} exists only if we have CONFIG_PM; do the same +thing as other subdrivers... + +Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> +Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +--- + +diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c +index bc3e785..fe70e72 100644 +--- a/drivers/usb/host/ohci-ssb.c ++++ b/drivers/usb/host/ohci-ssb.c +@@ -117,8 +117,10 @@ static const struct hc_driver ssb_ohci_hc_driver = { + .hub_status_data = ohci_hub_status_data, + .hub_control = ohci_hub_control, + .hub_irq_enable = ohci_rhsc_enable, ++#ifdef CONFIG_PM + .bus_suspend = ohci_bus_suspend, + .bus_resume = ohci_bus_resume, ++#endif + + .start_port_reset = ohci_start_port_reset, + }; |