2c2
< __FBSDID("$FreeBSD: head/sys/mips/cavium/usb/octusb_octeon.c 227849 2011-11-22 21:56:55Z hselasky $");
---
> __FBSDID("$FreeBSD: head/sys/mips/cavium/usb/octusb_octeon.c 228483 2011-12-14 00:28:54Z hselasky $");
185,199d184
< static int
< octusb_octeon_shutdown(device_t dev)
< {
< struct octusb_octeon_softc *sc = device_get_softc(dev);
< int err;
<
< err = bus_generic_shutdown(dev);
< if (err)
< return (err);
<
< octusb_uninit(&sc->sc_dci);
<
< return (0);
< }
<
206c191,193
< DEVMETHOD(device_shutdown, octusb_octeon_shutdown),
---
> DEVMETHOD(device_resume, bus_generic_resume),
> DEVMETHOD(device_suspend, bus_generic_suspend),
> DEVMETHOD(device_shutdown, bus_generic_shutdown),
212,214c199,201
< "octusb",
< octusb_octeon_methods,
< sizeof(struct octusb_octeon_softc),
---
> .name = "octusb",
> .methods = octusb_octeon_methods,
> .size = sizeof(struct octusb_octeon_softc),