merge mainline into usb

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-01 21:23:18 +02:00
commit fafc23e90a
39 changed files with 1436 additions and 229 deletions

View file

@ -78,6 +78,12 @@ grub_libusb_devices (void)
return GRUB_USB_ERR_NONE;
}
void
grub_usb_poll_devices (void)
{
/* TODO: recheck grub_usb_devs */
}
int
grub_usb_iterate (int (*hook) (grub_usb_device_t dev))

View file

@ -459,7 +459,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
grub_dma_free (o->hcca_chunk);
grub_free (o);
return 1;
return 0;
}