diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-03 15:46:17 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-03 15:46:17 -0500 |
| commit | b34bd5e5c8f356ec206e5a306ee3a9b6f42c4315 (patch) | |
| tree | 3608ad1bbebf6284467879256edc530299a4d21b /default-configs/i386-softmmu.mak | |
| parent | 0f66998ff6d5d2133b9b08471a44e13b11119e50 (diff) | |
| parent | e4b65262a3b6633fe107e4ce7660b41a71a16e5f (diff) | |
| download | qemu-b34bd5e5c8f356ec206e5a306ee3a9b6f42c4315.tar.gz | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* bonzini/scsi-next:
scsi: add support for ATA_PASSTHROUGH_xx scsi command
esp: add missing const on TypeInfo structures
esp: enable for all PCI machines
Revert "megasas: disable due to build breakage"
megasas: static SAS addresses
scsi-disk: fix compilation with DEBUG_SCSI
megasas: Update function megasys_scsi_uninit
SCSI: STARTSTOPUNIT only eject/load media if powercondition is 0
SCSI: Update the sense code for PREVENT REMOVAL errors
Diffstat (limited to 'default-configs/i386-softmmu.mak')
| -rw-r--r-- | default-configs/i386-softmmu.mak | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index fee8cde88b..2c78175ae7 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -25,4 +25,3 @@ CONFIG_HPET=y CONFIG_APPLESMC=y CONFIG_I8259=y CONFIG_PFLASH_CFI01=y -CONFIG_ESP=y |