mirror of
https://abf.rosa.ru/djam/kernel.git
synced 2025-02-24 08:42:53 +00:00
b6b23129ad
See the commits 05a8c4904699..16da528365de in https://abf.io/kernels_stable/kernel-4.6. Hightlights: * New build model: everything in a single project. * PAE by default on i586. No non-PAE flavours remain. * SELinux is now built in (disabled by default). * Dropped ndiswrapper (can be built separately if it is really needed).
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
>From 9f04e51293b130474504216a477bb2a73cbf59e1 Mon Sep 17 00:00:00 2001
|
|
From: Anssi Hannula <anssi.hannula@iki.fi>
|
|
Date: Thu, 22 Mar 2012 22:29:11 +0200
|
|
Subject: [PATCH] ata: prefer ata drivers over ide drivers when both are built
|
|
|
|
Currently the old IDE drivers are preferred over ATA drivers when both
|
|
are built, since ide/ is listed first in drivers/Makefile and therefore
|
|
the IDE drivers end up before ATA drivers in modules.order which is used
|
|
by depmod/modprobe for module ordering.
|
|
|
|
Change it so that ATA drivers are preferred over IDE driver by moving
|
|
the ide/ entry under ata/ in drivers/Makefile.
|
|
|
|
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
|
|
---
|
|
drivers/Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/Makefile b/drivers/Makefile
|
|
index 932e8bf..e8df3d0 100644
|
|
--- a/drivers/Makefile
|
|
+++ b/drivers/Makefile
|
|
@@ -64,9 +64,9 @@ obj-y += base/ block/ misc/ mfd/ nfc/
|
|
obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
|
|
obj-$(CONFIG_NUBUS) += nubus/
|
|
obj-y += macintosh/
|
|
-obj-$(CONFIG_IDE) += ide/
|
|
obj-$(CONFIG_SCSI) += scsi/
|
|
obj-$(CONFIG_ATA) += ata/
|
|
+obj-$(CONFIG_IDE) += ide/
|
|
obj-$(CONFIG_TARGET_CORE) += target/
|
|
obj-$(CONFIG_MTD) += mtd/
|
|
obj-$(CONFIG_SPI) += spi/
|