merge mainline into ahci

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-12-24 16:16:01 +01:00
commit de2690be7c
984 changed files with 85724 additions and 20016 deletions

View file

@ -44,7 +44,7 @@ static inline grub_uint32_t
grub_make_scsi_id (int subsystem, int bus, int lun)
{
return (subsystem << GRUB_SCSI_ID_SUBSYSTEM_SHIFT)
| (bus << GRUB_SCSI_ID_BUS_SHIFT) | (lun << GRUB_SCSI_ID_BUS_SHIFT);
| (bus << GRUB_SCSI_ID_BUS_SHIFT) | (lun << GRUB_SCSI_ID_LUN_SHIFT);
}
struct grub_scsi_dev