--- ./grub/include/grub/scsi.h	2010-09-30 22:17:31.000000000 +0200
+++ ./grub_patched/include/grub/scsi.h	2010-10-01 15:58:23.000000000 +0200
@@ -40,7 +40,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