Signed-off-by: Christoph Hellwig <h...@lst.de> Index: qemu/Makefile.objs =================================================================== --- qemu.orig/Makefile.objs 2010-07-09 09:25:52.856639729 -0700 +++ qemu/Makefile.objs 2010-07-09 09:26:15.562639727 -0700 @@ -70,7 +70,8 @@ common-obj-$(CONFIG_DS1338) += ds1338.o common-obj-y += i2c.o smbus.o smbus_eeprom.o common-obj-y += eeprom93xx.o common-obj-y += scsi-disk.o cdrom.o -common-obj-y += scsi-generic.o scsi-bus.o +common-obj-$(CONFIG_LINUX) += scsi-generic.o +common-obj-y += scsi-bus.o common-obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o common-obj-y += usb-serial.o usb-net.o usb-bus.o common-obj-$(CONFIG_SSI) += ssi.o Index: qemu/hw/scsi-generic.c =================================================================== --- qemu.orig/hw/scsi-generic.c 2010-07-09 09:26:18.937639727 -0700 +++ qemu/hw/scsi-generic.c 2010-07-09 09:26:34.216639727 -0700 @@ -15,8 +15,6 @@ #include "qemu-error.h" #include "scsi.h" -#ifdef __linux__ - //#define DEBUG_SCSI #ifdef DEBUG_SCSI @@ -544,5 +542,3 @@ static void scsi_generic_register_device scsi_qdev_register(&scsi_generic_info); } device_init(scsi_generic_register_devices) - -#endif /* __linux__ */