diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:37:27 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:37:27 +0200 |
| commit | fe8d63c8c75acc87d398b2e181b9135d2ecfc05a (patch) | |
| tree | 4eec2967c157e11cbf54f41845fb1350d3cc772f /drivers/block/Makefile | |
| parent | 9844d027b52cc89264f6bf7686e26d9dc50134fd (diff) | |
| parent | 86cf2ae492db316e73512a1786d57ece9b3a7624 (diff) | |
| download | u-boot-imx-fe8d63c8c75acc87d398b2e181b9135d2ecfc05a.zip u-boot-imx-fe8d63c8c75acc87d398b2e181b9135d2ecfc05a.tar.gz u-boot-imx-fe8d63c8c75acc87d398b2e181b9135d2ecfc05a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Diffstat (limited to 'drivers/block/Makefile')
| -rw-r--r-- | drivers/block/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 3f6ad5c..64dcf4e 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -25,15 +25,16 @@ include $(TOPDIR)/config.mk LIB := $(obj)libblock.a +COBJS-$(CONFIG_SCSI_AHCI) += ahci.o COBJS-$(CONFIG_ATA_PIIX) += ata_piix.o -COBJS-$(CONFIG_CMD_MG_DISK) += mg_disk.o COBJS-$(CONFIG_FSL_SATA) += fsl_sata.o -COBJS-$(CONFIG_IDE_SIL680) += sil680.o COBJS-$(CONFIG_LIBATA) += libata.o +COBJS-$(CONFIG_CMD_MG_DISK) += mg_disk.o +COBJS-$(CONFIG_MVSATA_IDE) += mvsata_ide.o COBJS-$(CONFIG_PATA_BFIN) += pata_bfin.o COBJS-$(CONFIG_SATA_DWC) += sata_dwc.o COBJS-$(CONFIG_SATA_SIL3114) += sata_sil3114.o -COBJS-$(CONFIG_SCSI_AHCI) += ahci.o +COBJS-$(CONFIG_IDE_SIL680) += sil680.o COBJS-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o COBJS-$(CONFIG_SYSTEMACE) += systemace.o |