diff --git a/[refs] b/[refs] index b52fd559d2fe..0ac6a11ae5cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21e2c01dc3e38d466eda5871645878d2c3a33261 +refs/heads/master: 10e047b40aafefef1fdc8ea4ea7837b9557a9400 diff --git a/trunk/drivers/ide/Makefile b/trunk/drivers/ide/Makefile index 5be8ad6dc9ed..cca9c075966d 100644 --- a/trunk/drivers/ide/Makefile +++ b/trunk/drivers/ide/Makefile @@ -20,7 +20,6 @@ ide-core-$(CONFIG_BLK_DEV_CMD640) += pci/cmd640.o # Core IDE code - must come before legacy ide-core-$(CONFIG_BLK_DEV_IDEPCI) += setup-pci.o ide-core-$(CONFIG_BLK_DEV_IDEDMA) += ide-dma.o -ide-core-$(CONFIG_BLK_DEV_IDE_TCQ) += ide-tcq.o ide-core-$(CONFIG_PROC_FS) += ide-proc.o ide-core-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o