diff options
-rw-r--r-- | drivers/Kconfig | 2 | ||||
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/ata/Kconfig | 140 | ||||
-rw-r--r-- | drivers/ata/Makefile | 19 | ||||
-rw-r--r-- | drivers/ata/ahci.c (renamed from drivers/scsi/ahci.c) | 0 | ||||
-rw-r--r-- | drivers/ata/ata_piix.c (renamed from drivers/scsi/ata_piix.c) | 0 | ||||
-rw-r--r-- | drivers/ata/libata-bmdma.c (renamed from drivers/scsi/libata-bmdma.c) | 0 | ||||
-rw-r--r-- | drivers/ata/libata-core.c (renamed from drivers/scsi/libata-core.c) | 1 | ||||
-rw-r--r-- | drivers/ata/libata-eh.c (renamed from drivers/scsi/libata-eh.c) | 2 | ||||
-rw-r--r-- | drivers/ata/libata-scsi.c (renamed from drivers/scsi/libata-scsi.c) | 0 | ||||
-rw-r--r-- | drivers/ata/libata.h (renamed from drivers/scsi/libata.h) | 0 | ||||
-rw-r--r-- | drivers/ata/pdc_adma.c (renamed from drivers/scsi/pdc_adma.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_mv.c (renamed from drivers/scsi/sata_mv.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_nv.c (renamed from drivers/scsi/sata_nv.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_promise.c (renamed from drivers/scsi/sata_promise.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_promise.h (renamed from drivers/scsi/sata_promise.h) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_qstor.c (renamed from drivers/scsi/sata_qstor.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_sil.c (renamed from drivers/scsi/sata_sil.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_sil24.c (renamed from drivers/scsi/sata_sil24.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_sis.c (renamed from drivers/scsi/sata_sis.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_svw.c (renamed from drivers/scsi/sata_svw.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_sx4.c (renamed from drivers/scsi/sata_sx4.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_uli.c (renamed from drivers/scsi/sata_uli.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_via.c (renamed from drivers/scsi/sata_via.c) | 0 | ||||
-rw-r--r-- | drivers/ata/sata_vsc.c (renamed from drivers/scsi/sata_vsc.c) | 0 | ||||
-rw-r--r-- | drivers/scsi/Kconfig | 138 | ||||
-rw-r--r-- | drivers/scsi/Makefile | 16 |
27 files changed, 163 insertions, 156 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 8b11cebe65df..263e86ddc1a4 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
@@ -18,6 +18,8 @@ source "drivers/ide/Kconfig" | |||
18 | 18 | ||
19 | source "drivers/scsi/Kconfig" | 19 | source "drivers/scsi/Kconfig" |
20 | 20 | ||
21 | source "drivers/ata/Kconfig" | ||
22 | |||
21 | source "drivers/cdrom/Kconfig" | 23 | source "drivers/cdrom/Kconfig" |
22 | 24 | ||
23 | source "drivers/md/Kconfig" | 25 | source "drivers/md/Kconfig" |
diff --git a/drivers/Makefile b/drivers/Makefile index fc2d744a4e4a..4ac14dab3079 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
@@ -34,6 +34,7 @@ obj-$(CONFIG_PPC_PMAC) += macintosh/ | |||
34 | obj-$(CONFIG_IDE) += ide/ | 34 | obj-$(CONFIG_IDE) += ide/ |
35 | obj-$(CONFIG_FC4) += fc4/ | 35 | obj-$(CONFIG_FC4) += fc4/ |
36 | obj-$(CONFIG_SCSI) += scsi/ | 36 | obj-$(CONFIG_SCSI) += scsi/ |
37 | obj-$(CONFIG_ATA) += ata/ | ||
37 | obj-$(CONFIG_FUSION) += message/ | 38 | obj-$(CONFIG_FUSION) += message/ |
38 | obj-$(CONFIG_IEEE1394) += ieee1394/ | 39 | obj-$(CONFIG_IEEE1394) += ieee1394/ |
39 | obj-y += cdrom/ | 40 | obj-y += cdrom/ |
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig new file mode 100644 index 000000000000..95d6b417af65 --- /dev/null +++ b/drivers/ata/Kconfig | |||
@@ -0,0 +1,140 @@ | |||
1 | |||
2 | config ATA | ||
3 | tristate "ATA device support" | ||
4 | depends on SCSI | ||
5 | ---help--- | ||
6 | If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or | ||
7 | any other ATA device under Linux, say Y and make sure that you know | ||
8 | the name of your ATA host adapter (the card inside your computer | ||
9 | that "speaks" the ATA protocol, also called ATA controller), | ||
10 | because you will be asked for it. | ||
11 | |||
12 | config SCSI_SATA_AHCI | ||
13 | tristate "AHCI SATA support" | ||
14 | depends on ATA && PCI | ||
15 | help | ||
16 | This option enables support for AHCI Serial ATA. | ||
17 | |||
18 | If unsure, say N. | ||
19 | |||
20 | config SCSI_SATA_SVW | ||
21 | tristate "ServerWorks Frodo / Apple K2 SATA support" | ||
22 | depends on ATA && PCI | ||
23 | help | ||
24 | This option enables support for Broadcom/Serverworks/Apple K2 | ||
25 | SATA support. | ||
26 | |||
27 | If unsure, say N. | ||
28 | |||
29 | config SCSI_ATA_PIIX | ||
30 | tristate "Intel PIIX/ICH SATA support" | ||
31 | depends on ATA && PCI | ||
32 | help | ||
33 | This option enables support for ICH5/6/7/8 Serial ATA. | ||
34 | If PATA support was enabled previously, this enables | ||
35 | support for select Intel PIIX/ICH PATA host controllers. | ||
36 | |||
37 | If unsure, say N. | ||
38 | |||
39 | config SCSI_SATA_MV | ||
40 | tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)" | ||
41 | depends on ATA && PCI && EXPERIMENTAL | ||
42 | help | ||
43 | This option enables support for the Marvell Serial ATA family. | ||
44 | Currently supports 88SX[56]0[48][01] chips. | ||
45 | |||
46 | If unsure, say N. | ||
47 | |||
48 | config SCSI_SATA_NV | ||
49 | tristate "NVIDIA SATA support" | ||
50 | depends on ATA && PCI | ||
51 | help | ||
52 | This option enables support for NVIDIA Serial ATA. | ||
53 | |||
54 | If unsure, say N. | ||
55 | |||
56 | config SCSI_PDC_ADMA | ||
57 | tristate "Pacific Digital ADMA support" | ||
58 | depends on ATA && PCI | ||
59 | help | ||
60 | This option enables support for Pacific Digital ADMA controllers | ||
61 | |||
62 | If unsure, say N. | ||
63 | |||
64 | config SCSI_SATA_QSTOR | ||
65 | tristate "Pacific Digital SATA QStor support" | ||
66 | depends on ATA && PCI | ||
67 | help | ||
68 | This option enables support for Pacific Digital Serial ATA QStor. | ||
69 | |||
70 | If unsure, say N. | ||
71 | |||
72 | config SCSI_SATA_PROMISE | ||
73 | tristate "Promise SATA TX2/TX4 support" | ||
74 | depends on ATA && PCI | ||
75 | help | ||
76 | This option enables support for Promise Serial ATA TX2/TX4. | ||
77 | |||
78 | If unsure, say N. | ||
79 | |||
80 | config SCSI_SATA_SX4 | ||
81 | tristate "Promise SATA SX4 support" | ||
82 | depends on ATA && PCI && EXPERIMENTAL | ||
83 | help | ||
84 | This option enables support for Promise Serial ATA SX4. | ||
85 | |||
86 | If unsure, say N. | ||
87 | |||
88 | config SCSI_SATA_SIL | ||
89 | tristate "Silicon Image SATA support" | ||
90 | depends on ATA && PCI | ||
91 | help | ||
92 | This option enables support for Silicon Image Serial ATA. | ||
93 | |||
94 | If unsure, say N. | ||
95 | |||
96 | config SCSI_SATA_SIL24 | ||
97 | tristate "Silicon Image 3124/3132 SATA support" | ||
98 | depends on ATA && PCI | ||
99 | help | ||
100 | This option enables support for Silicon Image 3124/3132 Serial ATA. | ||
101 | |||
102 | If unsure, say N. | ||
103 | |||
104 | config SCSI_SATA_SIS | ||
105 | tristate "SiS 964/180 SATA support" | ||
106 | depends on ATA && PCI | ||
107 | help | ||
108 | This option enables support for SiS Serial ATA 964/180. | ||
109 | |||
110 | If unsure, say N. | ||
111 | |||
112 | config SCSI_SATA_ULI | ||
113 | tristate "ULi Electronics SATA support" | ||
114 | depends on ATA && PCI | ||
115 | help | ||
116 | This option enables support for ULi Electronics SATA. | ||
117 | |||
118 | If unsure, say N. | ||
119 | |||
120 | config SCSI_SATA_VIA | ||
121 | tristate "VIA SATA support" | ||
122 | depends on ATA && PCI | ||
123 | help | ||
124 | This option enables support for VIA Serial ATA. | ||
125 | |||
126 | If unsure, say N. | ||
127 | |||
128 | config SCSI_SATA_VITESSE | ||
129 | tristate "VITESSE VSC-7174 / INTEL 31244 SATA support" | ||
130 | depends on ATA && PCI | ||
131 | help | ||
132 | This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA. | ||
133 | |||
134 | If unsure, say N. | ||
135 | |||
136 | config SCSI_SATA_INTEL_COMBINED | ||
137 | bool | ||
138 | depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX) | ||
139 | default y | ||
140 | |||
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile new file mode 100644 index 000000000000..60bdb7b2b5ca --- /dev/null +++ b/drivers/ata/Makefile | |||
@@ -0,0 +1,19 @@ | |||
1 | |||
2 | obj-$(CONFIG_SCSI_SATA_AHCI) += libata.o ahci.o | ||
3 | obj-$(CONFIG_SCSI_SATA_SVW) += libata.o sata_svw.o | ||
4 | obj-$(CONFIG_SCSI_ATA_PIIX) += libata.o ata_piix.o | ||
5 | obj-$(CONFIG_SCSI_SATA_PROMISE) += libata.o sata_promise.o | ||
6 | obj-$(CONFIG_SCSI_SATA_QSTOR) += libata.o sata_qstor.o | ||
7 | obj-$(CONFIG_SCSI_SATA_SIL) += libata.o sata_sil.o | ||
8 | obj-$(CONFIG_SCSI_SATA_SIL24) += libata.o sata_sil24.o | ||
9 | obj-$(CONFIG_SCSI_SATA_VIA) += libata.o sata_via.o | ||
10 | obj-$(CONFIG_SCSI_SATA_VITESSE) += libata.o sata_vsc.o | ||
11 | obj-$(CONFIG_SCSI_SATA_SIS) += libata.o sata_sis.o | ||
12 | obj-$(CONFIG_SCSI_SATA_SX4) += libata.o sata_sx4.o | ||
13 | obj-$(CONFIG_SCSI_SATA_NV) += libata.o sata_nv.o | ||
14 | obj-$(CONFIG_SCSI_SATA_ULI) += libata.o sata_uli.o | ||
15 | obj-$(CONFIG_SCSI_SATA_MV) += libata.o sata_mv.o | ||
16 | obj-$(CONFIG_SCSI_PDC_ADMA) += libata.o pdc_adma.o | ||
17 | |||
18 | libata-objs := libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o | ||
19 | |||
diff --git a/drivers/scsi/ahci.c b/drivers/ata/ahci.c index 813031c01fba..813031c01fba 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/ata/ahci.c | |||
diff --git a/drivers/scsi/ata_piix.c b/drivers/ata/ata_piix.c index 46c34fd5af8f..46c34fd5af8f 100644 --- a/drivers/scsi/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
diff --git a/drivers/scsi/libata-bmdma.c b/drivers/ata/libata-bmdma.c index 158f62dbf21b..158f62dbf21b 100644 --- a/drivers/scsi/libata-bmdma.c +++ b/drivers/ata/libata-bmdma.c | |||
diff --git a/drivers/scsi/libata-core.c b/drivers/ata/libata-core.c index 3f963f206d4a..7d786fba4d82 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -50,7 +50,6 @@ | |||
50 | #include <linux/jiffies.h> | 50 | #include <linux/jiffies.h> |
51 | #include <linux/scatterlist.h> | 51 | #include <linux/scatterlist.h> |
52 | #include <scsi/scsi.h> | 52 | #include <scsi/scsi.h> |
53 | #include "scsi_priv.h" | ||
54 | #include <scsi/scsi_cmnd.h> | 53 | #include <scsi/scsi_cmnd.h> |
55 | #include <scsi/scsi_host.h> | 54 | #include <scsi/scsi_host.h> |
56 | #include <linux/libata.h> | 55 | #include <linux/libata.h> |
diff --git a/drivers/scsi/libata-eh.c b/drivers/ata/libata-eh.c index 29f59345305d..2c476eee463f 100644 --- a/drivers/scsi/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <scsi/scsi_eh.h> | 39 | #include <scsi/scsi_eh.h> |
40 | #include <scsi/scsi_device.h> | 40 | #include <scsi/scsi_device.h> |
41 | #include <scsi/scsi_cmnd.h> | 41 | #include <scsi/scsi_cmnd.h> |
42 | #include "scsi_transport_api.h" | 42 | #include "../scsi/scsi_transport_api.h" |
43 | 43 | ||
44 | #include <linux/libata.h> | 44 | #include <linux/libata.h> |
45 | 45 | ||
diff --git a/drivers/scsi/libata-scsi.c b/drivers/ata/libata-scsi.c index d168e3413661..d168e3413661 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
diff --git a/drivers/scsi/libata.h b/drivers/ata/libata.h index d4a4f82360ec..d4a4f82360ec 100644 --- a/drivers/scsi/libata.h +++ b/drivers/ata/libata.h | |||
diff --git a/drivers/scsi/pdc_adma.c b/drivers/ata/pdc_adma.c index 61d2aa697b4d..61d2aa697b4d 100644 --- a/drivers/scsi/pdc_adma.c +++ b/drivers/ata/pdc_adma.c | |||
diff --git a/drivers/scsi/sata_mv.c b/drivers/ata/sata_mv.c index a2915a56accd..a2915a56accd 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
diff --git a/drivers/scsi/sata_nv.c b/drivers/ata/sata_nv.c index be46df75ab5a..be46df75ab5a 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
diff --git a/drivers/scsi/sata_promise.c b/drivers/ata/sata_promise.c index a5b3a7db7a9f..a5b3a7db7a9f 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
diff --git a/drivers/scsi/sata_promise.h b/drivers/ata/sata_promise.h index 6ee5e190262d..6ee5e190262d 100644 --- a/drivers/scsi/sata_promise.h +++ b/drivers/ata/sata_promise.h | |||
diff --git a/drivers/scsi/sata_qstor.c b/drivers/ata/sata_qstor.c index 71bd6712b377..71bd6712b377 100644 --- a/drivers/scsi/sata_qstor.c +++ b/drivers/ata/sata_qstor.c | |||
diff --git a/drivers/scsi/sata_sil.c b/drivers/ata/sata_sil.c index 907faa87239b..907faa87239b 100644 --- a/drivers/scsi/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
diff --git a/drivers/scsi/sata_sil24.c b/drivers/ata/sata_sil24.c index 3a0161ddc33f..3a0161ddc33f 100644 --- a/drivers/scsi/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
diff --git a/drivers/scsi/sata_sis.c b/drivers/ata/sata_sis.c index ac24f66897f6..ac24f66897f6 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/ata/sata_sis.c | |||
diff --git a/drivers/scsi/sata_svw.c b/drivers/ata/sata_svw.c index baf259a966d0..baf259a966d0 100644 --- a/drivers/scsi/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
diff --git a/drivers/scsi/sata_sx4.c b/drivers/ata/sata_sx4.c index 0da83cba5c12..0da83cba5c12 100644 --- a/drivers/scsi/sata_sx4.c +++ b/drivers/ata/sata_sx4.c | |||
diff --git a/drivers/scsi/sata_uli.c b/drivers/ata/sata_uli.c index 654aae2b25c5..654aae2b25c5 100644 --- a/drivers/scsi/sata_uli.c +++ b/drivers/ata/sata_uli.c | |||
diff --git a/drivers/scsi/sata_via.c b/drivers/ata/sata_via.c index 0bf1dbea6406..0bf1dbea6406 100644 --- a/drivers/scsi/sata_via.c +++ b/drivers/ata/sata_via.c | |||
diff --git a/drivers/scsi/sata_vsc.c b/drivers/ata/sata_vsc.c index 4c69a705a483..4c69a705a483 100644 --- a/drivers/scsi/sata_vsc.c +++ b/drivers/ata/sata_vsc.c | |||
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 96a81cd17617..2df4d15c9634 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -471,67 +471,6 @@ config SCSI_IN2000 | |||
471 | 471 | ||
472 | source "drivers/scsi/megaraid/Kconfig.megaraid" | 472 | source "drivers/scsi/megaraid/Kconfig.megaraid" |
473 | 473 | ||
474 | config SCSI_SATA | ||
475 | tristate "Serial ATA (SATA) support" | ||
476 | depends on SCSI | ||
477 | help | ||
478 | This driver family supports Serial ATA host controllers | ||
479 | and devices. | ||
480 | |||
481 | If unsure, say N. | ||
482 | |||
483 | config SCSI_SATA_AHCI | ||
484 | tristate "AHCI SATA support" | ||
485 | depends on SCSI_SATA && PCI | ||
486 | help | ||
487 | This option enables support for AHCI Serial ATA. | ||
488 | |||
489 | If unsure, say N. | ||
490 | |||
491 | config SCSI_SATA_SVW | ||
492 | tristate "ServerWorks Frodo / Apple K2 SATA support" | ||
493 | depends on SCSI_SATA && PCI | ||
494 | help | ||
495 | This option enables support for Broadcom/Serverworks/Apple K2 | ||
496 | SATA support. | ||
497 | |||
498 | If unsure, say N. | ||
499 | |||
500 | config SCSI_ATA_PIIX | ||
501 | tristate "Intel PIIX/ICH SATA support" | ||
502 | depends on SCSI_SATA && PCI | ||
503 | help | ||
504 | This option enables support for ICH5/6/7/8 Serial ATA. | ||
505 | If PATA support was enabled previously, this enables | ||
506 | support for select Intel PIIX/ICH PATA host controllers. | ||
507 | |||
508 | If unsure, say N. | ||
509 | |||
510 | config SCSI_SATA_MV | ||
511 | tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)" | ||
512 | depends on SCSI_SATA && PCI && EXPERIMENTAL | ||
513 | help | ||
514 | This option enables support for the Marvell Serial ATA family. | ||
515 | Currently supports 88SX[56]0[48][01] chips. | ||
516 | |||
517 | If unsure, say N. | ||
518 | |||
519 | config SCSI_SATA_NV | ||
520 | tristate "NVIDIA SATA support" | ||
521 | depends on SCSI_SATA && PCI && EXPERIMENTAL | ||
522 | help | ||
523 | This option enables support for NVIDIA Serial ATA. | ||
524 | |||
525 | If unsure, say N. | ||
526 | |||
527 | config SCSI_PDC_ADMA | ||
528 | tristate "Pacific Digital ADMA support" | ||
529 | depends on SCSI_SATA && PCI | ||
530 | help | ||
531 | This option enables support for Pacific Digital ADMA controllers | ||
532 | |||
533 | If unsure, say N. | ||
534 | |||
535 | config SCSI_HPTIOP | 474 | config SCSI_HPTIOP |
536 | tristate "HighPoint RocketRAID 3xxx Controller support" | 475 | tristate "HighPoint RocketRAID 3xxx Controller support" |
537 | depends on SCSI && PCI | 476 | depends on SCSI && PCI |
@@ -542,83 +481,6 @@ config SCSI_HPTIOP | |||
542 | To compile this driver as a module, choose M here; the module | 481 | To compile this driver as a module, choose M here; the module |
543 | will be called hptiop. If unsure, say N. | 482 | will be called hptiop. If unsure, say N. |
544 | 483 | ||
545 | config SCSI_SATA_QSTOR | ||
546 | tristate "Pacific Digital SATA QStor support" | ||
547 | depends on SCSI_SATA && PCI | ||
548 | help | ||
549 | This option enables support for Pacific Digital Serial ATA QStor. | ||
550 | |||
551 | If unsure, say N. | ||
552 | |||
553 | config SCSI_SATA_PROMISE | ||
554 | tristate "Promise SATA TX2/TX4 support" | ||
555 | depends on SCSI_SATA && PCI | ||
556 | help | ||
557 | This option enables support for Promise Serial ATA TX2/TX4. | ||
558 | |||
559 | If unsure, say N. | ||
560 | |||
561 | config SCSI_SATA_SX4 | ||
562 | tristate "Promise SATA SX4 support" | ||
563 | depends on SCSI_SATA && PCI && EXPERIMENTAL | ||
564 | help | ||
565 | This option enables support for Promise Serial ATA SX4. | ||
566 | |||
567 | If unsure, say N. | ||
568 | |||
569 | config SCSI_SATA_SIL | ||
570 | tristate "Silicon Image SATA support" | ||
571 | depends on SCSI_SATA && PCI && EXPERIMENTAL | ||
572 | help | ||
573 | This option enables support for Silicon Image Serial ATA. | ||
574 | |||
575 | If unsure, say N. | ||
576 | |||
577 | config SCSI_SATA_SIL24 | ||
578 | tristate "Silicon Image 3124/3132 SATA support" | ||
579 | depends on SCSI_SATA && PCI && EXPERIMENTAL | ||
580 | help | ||
581 | This option enables support for Silicon Image 3124/3132 Serial ATA. | ||
582 | |||
583 | If unsure, say N. | ||
584 | |||
585 | config SCSI_SATA_SIS | ||
586 | tristate "SiS 964/180 SATA support" | ||
587 | depends on SCSI_SATA && PCI && EXPERIMENTAL | ||
588 | help | ||
589 | This option enables support for SiS Serial ATA 964/180. | ||
590 | |||
591 | If unsure, say N. | ||
592 | |||
593 | config SCSI_SATA_ULI | ||
594 | tristate "ULi Electronics SATA support" | ||
595 | depends on SCSI_SATA && PCI && EXPERIMENTAL | ||
596 | help | ||
597 | This option enables support for ULi Electronics SATA. | ||
598 | |||
599 | If unsure, say N. | ||
600 | |||
601 | config SCSI_SATA_VIA | ||
602 | tristate "VIA SATA support" | ||
603 | depends on SCSI_SATA && PCI | ||
604 | help | ||
605 | This option enables support for VIA Serial ATA. | ||
606 | |||
607 | If unsure, say N. | ||
608 | |||
609 | config SCSI_SATA_VITESSE | ||
610 | tristate "VITESSE VSC-7174 / INTEL 31244 SATA support" | ||
611 | depends on SCSI_SATA && PCI | ||
612 | help | ||
613 | This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA. | ||
614 | |||
615 | If unsure, say N. | ||
616 | |||
617 | config SCSI_SATA_INTEL_COMBINED | ||
618 | bool | ||
619 | depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX) | ||
620 | default y | ||
621 | |||
622 | config SCSI_BUSLOGIC | 484 | config SCSI_BUSLOGIC |
623 | tristate "BusLogic SCSI support" | 485 | tristate "BusLogic SCSI support" |
624 | depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API | 486 | depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API |
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index ebd0cf00bf3e..b678f957cfe2 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile | |||
@@ -122,21 +122,6 @@ obj-$(CONFIG_SCSI_LASI700) += 53c700.o lasi700.o | |||
122 | obj-$(CONFIG_SCSI_NSP32) += nsp32.o | 122 | obj-$(CONFIG_SCSI_NSP32) += nsp32.o |
123 | obj-$(CONFIG_SCSI_IPR) += ipr.o | 123 | obj-$(CONFIG_SCSI_IPR) += ipr.o |
124 | obj-$(CONFIG_SCSI_IBMVSCSI) += ibmvscsi/ | 124 | obj-$(CONFIG_SCSI_IBMVSCSI) += ibmvscsi/ |
125 | obj-$(CONFIG_SCSI_SATA_AHCI) += libata.o ahci.o | ||
126 | obj-$(CONFIG_SCSI_SATA_SVW) += libata.o sata_svw.o | ||
127 | obj-$(CONFIG_SCSI_ATA_PIIX) += libata.o ata_piix.o | ||
128 | obj-$(CONFIG_SCSI_SATA_PROMISE) += libata.o sata_promise.o | ||
129 | obj-$(CONFIG_SCSI_SATA_QSTOR) += libata.o sata_qstor.o | ||
130 | obj-$(CONFIG_SCSI_SATA_SIL) += libata.o sata_sil.o | ||
131 | obj-$(CONFIG_SCSI_SATA_SIL24) += libata.o sata_sil24.o | ||
132 | obj-$(CONFIG_SCSI_SATA_VIA) += libata.o sata_via.o | ||
133 | obj-$(CONFIG_SCSI_SATA_VITESSE) += libata.o sata_vsc.o | ||
134 | obj-$(CONFIG_SCSI_SATA_SIS) += libata.o sata_sis.o | ||
135 | obj-$(CONFIG_SCSI_SATA_SX4) += libata.o sata_sx4.o | ||
136 | obj-$(CONFIG_SCSI_SATA_NV) += libata.o sata_nv.o | ||
137 | obj-$(CONFIG_SCSI_SATA_ULI) += libata.o sata_uli.o | ||
138 | obj-$(CONFIG_SCSI_SATA_MV) += libata.o sata_mv.o | ||
139 | obj-$(CONFIG_SCSI_PDC_ADMA) += libata.o pdc_adma.o | ||
140 | obj-$(CONFIG_SCSI_HPTIOP) += hptiop.o | 125 | obj-$(CONFIG_SCSI_HPTIOP) += hptiop.o |
141 | 126 | ||
142 | obj-$(CONFIG_ARM) += arm/ | 127 | obj-$(CONFIG_ARM) += arm/ |
@@ -166,7 +151,6 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \ | |||
166 | CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m) | 151 | CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m) |
167 | zalon7xx-objs := zalon.o ncr53c8xx.o | 152 | zalon7xx-objs := zalon.o ncr53c8xx.o |
168 | NCR_Q720_mod-objs := NCR_Q720.o ncr53c8xx.o | 153 | NCR_Q720_mod-objs := NCR_Q720.o ncr53c8xx.o |
169 | libata-objs := libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o | ||
170 | oktagon_esp_mod-objs := oktagon_esp.o oktagon_io.o | 154 | oktagon_esp_mod-objs := oktagon_esp.o oktagon_io.o |
171 | 155 | ||
172 | # Files generated that shall be removed upon make clean | 156 | # Files generated that shall be removed upon make clean |