diff options
| author | Stefano Babic <sbabic@denx.de> | 2016-05-24 14:55:06 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-05-24 14:55:06 +0200 |
| commit | 08ca213acadef61748dc62d48b0f5c4bed8b8c2d (patch) | |
| tree | 36cf415b78775ee63acdfc34d636d2b7d7936a78 /include/configs/qemu-x86.h | |
| parent | d15a244b059e361475302bccd471e65a48ee2b1f (diff) | |
| parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
| download | blackbird-obmc-uboot-08ca213acadef61748dc62d48b0f5c4bed8b8c2d.tar.gz blackbird-obmc-uboot-08ca213acadef61748dc62d48b0f5c4bed8b8c2d.zip | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/configs/qemu-x86.h')
| -rw-r--r-- | include/configs/qemu-x86.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index b0d2ffe5b4..476d37d4bc 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -43,7 +43,7 @@ #define CONFIG_ATAPI #undef CONFIG_SCSI_AHCI -#undef CONFIG_CMD_SCSI +#undef CONFIG_SCSI #else #define CONFIG_SCSI_DEV_LIST \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_AHCI} |
