Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[linux-2.6-block.git] / drivers / scsi / storvsc_drv.c

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 5dd6c49bfa7e6067d7773b752b20c9a439ab5414..16a3a0cc96723c5c0fca08ae54638aecb1f18dcd 100644 (file)
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1463,13 +1463,13 @@ enum {
 
 static const struct hv_vmbus_device_id id_table[] = {
        /* SCSI guid */
-       { VMBUS_DEVICE(0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d,
-                      0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f)
-         .driver_data = SCSI_GUID },
+       { HV_SCSI_GUID,
+         .driver_data = SCSI_GUID
+       },
        /* IDE guid */
-       { VMBUS_DEVICE(0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
-                      0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5)
-         .driver_data = IDE_GUID },
+       { HV_IDE_GUID,
+         .driver_data = IDE_GUID
+       },
        { },
 };