diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-06-27 17:36:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:11:43 -0400 |
commit | 8c8709334cec803368a432a33e0f2e116d48fe07 (patch) | |
tree | f3298ae6d844e548c36df9fc3bfb5a3662d4e45d /drivers/usb | |
parent | fcd16cc084f2b98ab64d27721abdb941f3d9c4cb (diff) |
[PATCH] ppc32: Remove CONFIG_PMAC_PBOOK
This patch removes CONFIG_PMAC_PBOOK (PowerBook support). This is now
split into CONFIG_PMAC_MEDIABAY for the actual hotswap bay that some
powerbooks have, CONFIG_PM for power management related code, and just left
out of any CONFIG_* option for some generally useful stuff that can be used
on non-laptops as well.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/ohci-pci.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 57fd07d00549..eede6be098d2 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
@@ -14,14 +14,11 @@ | |||
14 | * This file is licenced under the GPL. | 14 | * This file is licenced under the GPL. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #ifdef CONFIG_PMAC_PBOOK | 17 | #ifdef CONFIG_PPC_PMAC |
18 | #include <asm/machdep.h> | 18 | #include <asm/machdep.h> |
19 | #include <asm/pmac_feature.h> | 19 | #include <asm/pmac_feature.h> |
20 | #include <asm/pci-bridge.h> | 20 | #include <asm/pci-bridge.h> |
21 | #include <asm/prom.h> | 21 | #include <asm/prom.h> |
22 | #ifndef CONFIG_PM | ||
23 | # define CONFIG_PM | ||
24 | #endif | ||
25 | #endif | 22 | #endif |
26 | 23 | ||
27 | #ifndef CONFIG_PCI | 24 | #ifndef CONFIG_PCI |
@@ -132,7 +129,7 @@ static int ohci_pci_suspend (struct usb_hcd *hcd, pm_message_t message) | |||
132 | /* let things settle down a bit */ | 129 | /* let things settle down a bit */ |
133 | msleep (100); | 130 | msleep (100); |
134 | 131 | ||
135 | #ifdef CONFIG_PMAC_PBOOK | 132 | #ifdef CONFIG_PPC_PMAC |
136 | if (_machine == _MACH_Pmac) { | 133 | if (_machine == _MACH_Pmac) { |
137 | struct device_node *of_node; | 134 | struct device_node *of_node; |
138 | 135 | ||
@@ -141,7 +138,7 @@ static int ohci_pci_suspend (struct usb_hcd *hcd, pm_message_t message) | |||
141 | if (of_node) | 138 | if (of_node) |
142 | pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 0); | 139 | pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 0); |
143 | } | 140 | } |
144 | #endif /* CONFIG_PMAC_PBOOK */ | 141 | #endif /* CONFIG_PPC_PMAC */ |
145 | return 0; | 142 | return 0; |
146 | } | 143 | } |
147 | 144 | ||
@@ -151,7 +148,7 @@ static int ohci_pci_resume (struct usb_hcd *hcd) | |||
151 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); | 148 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); |
152 | int retval = 0; | 149 | int retval = 0; |
153 | 150 | ||
154 | #ifdef CONFIG_PMAC_PBOOK | 151 | #ifdef CONFIG_PPC_PMAC |
155 | if (_machine == _MACH_Pmac) { | 152 | if (_machine == _MACH_Pmac) { |
156 | struct device_node *of_node; | 153 | struct device_node *of_node; |
157 | 154 | ||
@@ -160,7 +157,7 @@ static int ohci_pci_resume (struct usb_hcd *hcd) | |||
160 | if (of_node) | 157 | if (of_node) |
161 | pmac_call_feature (PMAC_FTR_USB_ENABLE, of_node, 0, 1); | 158 | pmac_call_feature (PMAC_FTR_USB_ENABLE, of_node, 0, 1); |
162 | } | 159 | } |
163 | #endif /* CONFIG_PMAC_PBOOK */ | 160 | #endif /* CONFIG_PPC_PMAC */ |
164 | 161 | ||
165 | /* resume root hub */ | 162 | /* resume root hub */ |
166 | if (time_before (jiffies, ohci->next_statechange)) | 163 | if (time_before (jiffies, ohci->next_statechange)) |