diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 03:09:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 03:09:51 -0400 |
| commit | 6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b (patch) | |
| tree | 2087ca69776116b70a6af0daae9c10bfac1aa347 /drivers/usb/host/ohci-pxa27x.c | |
| parent | ab7476cf76e560f0efda2a631a70aabe93009025 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge branch 'linus' into core/debug
Conflicts:
lib/vsprintf.c
Manual merge:
include/linux/kernel.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/host/ohci-pxa27x.c')
| -rw-r--r-- | drivers/usb/host/ohci-pxa27x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index 8c9c4849db6e..7f0f35c78185 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
| @@ -298,7 +298,6 @@ static const struct hc_driver ohci_pxa27x_hc_driver = { | |||
| 298 | */ | 298 | */ |
| 299 | .hub_status_data = ohci_hub_status_data, | 299 | .hub_status_data = ohci_hub_status_data, |
| 300 | .hub_control = ohci_hub_control, | 300 | .hub_control = ohci_hub_control, |
| 301 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 302 | #ifdef CONFIG_PM | 301 | #ifdef CONFIG_PM |
| 303 | .bus_suspend = ohci_bus_suspend, | 302 | .bus_suspend = ohci_bus_suspend, |
| 304 | .bus_resume = ohci_bus_resume, | 303 | .bus_resume = ohci_bus_resume, |