diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
| commit | e0d21d9cca25f424f3129649be48a63c128ed42d (patch) | |
| tree | 0a7d407639876e02deef1721817615eaa8c673a3 /drivers/ide/Makefile | |
| parent | beffbdc2211826b174c68307b1b48c93c05d7ded (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/Makefile')
| -rw-r--r-- | drivers/ide/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index 5be8ad6dc9ed..cca9c075966d 100644 --- a/drivers/ide/Makefile +++ b/drivers/ide/Makefile | |||
| @@ -20,7 +20,6 @@ ide-core-$(CONFIG_BLK_DEV_CMD640) += pci/cmd640.o | |||
| 20 | # Core IDE code - must come before legacy | 20 | # Core IDE code - must come before legacy |
| 21 | ide-core-$(CONFIG_BLK_DEV_IDEPCI) += setup-pci.o | 21 | ide-core-$(CONFIG_BLK_DEV_IDEPCI) += setup-pci.o |
| 22 | ide-core-$(CONFIG_BLK_DEV_IDEDMA) += ide-dma.o | 22 | ide-core-$(CONFIG_BLK_DEV_IDEDMA) += ide-dma.o |
| 23 | ide-core-$(CONFIG_BLK_DEV_IDE_TCQ) += ide-tcq.o | ||
| 24 | ide-core-$(CONFIG_PROC_FS) += ide-proc.o | 23 | ide-core-$(CONFIG_PROC_FS) += ide-proc.o |
| 25 | ide-core-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o | 24 | ide-core-$(CONFIG_BLK_DEV_IDEPNP) += ide-pnp.o |
| 26 | 25 | ||