Merge branch 'linus' into x86/timers

[linux-2.6-omap-h63xx.git] / drivers / usb / host / ohci-ps3.c

diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 01a0caeaa6bcc9345b74131baa03d3acfb956439..bfdeb0d22d050576755f6d1054d9d4b561bb7e3a 100644 (file)
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -68,7 +68,6 @@ static const struct hc_driver ps3_ohci_hc_driver = {
        .get_frame_number       = ohci_get_frame,
        .hub_status_data        = ohci_hub_status_data,
        .hub_control            = ohci_hub_control,
-       .hub_irq_enable         = ohci_rhsc_enable,
        .start_port_reset       = ohci_start_port_reset,
 #if defined(CONFIG_PM)
        .bus_suspend            = ohci_bus_suspend,
@@ -127,7 +126,6 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev)
                goto fail_irq;
        }
 
-       dev->core.power.power_state = PMSG_ON;
        dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */
 
        hcd = usb_create_hcd(&ps3_ohci_hc_driver, &dev->core, dev->core.bus_id);