Merge git://git.denx.de/u-boot-x86

diff --cc drivers/ata/Kconfig
index a1bd12ebe9f776877dc0b155673667f4fa32a169,db051605f5ceb11a8c80f592659d32e0e22fa8a3..803064aaf110a11c8da5e529084839e4f9b7b05b
--- 1/drivers/ata/Kconfig
--- 2/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@@ -20,8 -20,32 +20,14 @@@ config SAT
  
          See also CMD_SATA which provides command-line support.
  
 -config SCSI
 -      bool "Support SCSI controllers"
 -      help
 -        This enables support for SCSI (Small Computer System Interface),
 -        a parallel interface widely used with storage peripherals such as
 -        hard drives and optical drives. The SCSI standards define physical
 -        interfaces as well as protocols for controlling devices and
 -        tranferring data.
 -
 -config DM_SCSI
 -      bool "Support SCSI controllers with driver model"
 -      depends on BLK
 -      help
 -        This option enables the SCSI (Small Computer System Interface) uclass
 -        which supports SCSI and SATA HDDs. For every device configuration
 -        (IDs/LUNs) a block device is created with RAW read/write and
 -        filesystem support.
 -
  menu "SATA/SCSI device support"
  
+ config AHCI_PCI
+       bool "Support for PCI-based AHCI controller"
+       depends on DM_SCSI
+       help
+         Enables support for the PCI-based AHCI controller.
+ 
  config SATA_CEVA
        bool "Ceva Sata controller"
        depends on AHCI

diff --cc include/mmc.h
Simple merge