diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-14 14:10:07 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-14 14:10:07 -0400 |
commit | 8ad92ba7152f40cc31f6f15500c01e4eb39cfed1 (patch) | |
tree | 7075ed815c8b3a2d9a54db747234944b8af53841 /drivers/ata | |
parent | b352e57dc3bb5033996adaa67c2f69b795eddd39 (diff) |
libata: Remove SCSI_ prefix from Kconfig symbols
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/Kconfig | 34 | ||||
-rw-r--r-- | drivers/ata/Makefile | 30 |
2 files changed, 32 insertions, 32 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 95d6b417af65..03d96894419c 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -9,7 +9,7 @@ config ATA | |||
9 | that "speaks" the ATA protocol, also called ATA controller), | 9 | that "speaks" the ATA protocol, also called ATA controller), |
10 | because you will be asked for it. | 10 | because you will be asked for it. |
11 | 11 | ||
12 | config SCSI_SATA_AHCI | 12 | config SATA_AHCI |
13 | tristate "AHCI SATA support" | 13 | tristate "AHCI SATA support" |
14 | depends on ATA && PCI | 14 | depends on ATA && PCI |
15 | help | 15 | help |
@@ -17,7 +17,7 @@ config SCSI_SATA_AHCI | |||
17 | 17 | ||
18 | If unsure, say N. | 18 | If unsure, say N. |
19 | 19 | ||
20 | config SCSI_SATA_SVW | 20 | config SATA_SVW |
21 | tristate "ServerWorks Frodo / Apple K2 SATA support" | 21 | tristate "ServerWorks Frodo / Apple K2 SATA support" |
22 | depends on ATA && PCI | 22 | depends on ATA && PCI |
23 | help | 23 | help |
@@ -26,7 +26,7 @@ config SCSI_SATA_SVW | |||
26 | 26 | ||
27 | If unsure, say N. | 27 | If unsure, say N. |
28 | 28 | ||
29 | config SCSI_ATA_PIIX | 29 | config ATA_PIIX |
30 | tristate "Intel PIIX/ICH SATA support" | 30 | tristate "Intel PIIX/ICH SATA support" |
31 | depends on ATA && PCI | 31 | depends on ATA && PCI |
32 | help | 32 | help |
@@ -36,7 +36,7 @@ config SCSI_ATA_PIIX | |||
36 | 36 | ||
37 | If unsure, say N. | 37 | If unsure, say N. |
38 | 38 | ||
39 | config SCSI_SATA_MV | 39 | config SATA_MV |
40 | tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)" | 40 | tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)" |
41 | depends on ATA && PCI && EXPERIMENTAL | 41 | depends on ATA && PCI && EXPERIMENTAL |
42 | help | 42 | help |
@@ -45,7 +45,7 @@ config SCSI_SATA_MV | |||
45 | 45 | ||
46 | If unsure, say N. | 46 | If unsure, say N. |
47 | 47 | ||
48 | config SCSI_SATA_NV | 48 | config SATA_NV |
49 | tristate "NVIDIA SATA support" | 49 | tristate "NVIDIA SATA support" |
50 | depends on ATA && PCI | 50 | depends on ATA && PCI |
51 | help | 51 | help |
@@ -53,7 +53,7 @@ config SCSI_SATA_NV | |||
53 | 53 | ||
54 | If unsure, say N. | 54 | If unsure, say N. |
55 | 55 | ||
56 | config SCSI_PDC_ADMA | 56 | config PDC_ADMA |
57 | tristate "Pacific Digital ADMA support" | 57 | tristate "Pacific Digital ADMA support" |
58 | depends on ATA && PCI | 58 | depends on ATA && PCI |
59 | help | 59 | help |
@@ -61,7 +61,7 @@ config SCSI_PDC_ADMA | |||
61 | 61 | ||
62 | If unsure, say N. | 62 | If unsure, say N. |
63 | 63 | ||
64 | config SCSI_SATA_QSTOR | 64 | config SATA_QSTOR |
65 | tristate "Pacific Digital SATA QStor support" | 65 | tristate "Pacific Digital SATA QStor support" |
66 | depends on ATA && PCI | 66 | depends on ATA && PCI |
67 | help | 67 | help |
@@ -69,7 +69,7 @@ config SCSI_SATA_QSTOR | |||
69 | 69 | ||
70 | If unsure, say N. | 70 | If unsure, say N. |
71 | 71 | ||
72 | config SCSI_SATA_PROMISE | 72 | config SATA_PROMISE |
73 | tristate "Promise SATA TX2/TX4 support" | 73 | tristate "Promise SATA TX2/TX4 support" |
74 | depends on ATA && PCI | 74 | depends on ATA && PCI |
75 | help | 75 | help |
@@ -77,7 +77,7 @@ config SCSI_SATA_PROMISE | |||
77 | 77 | ||
78 | If unsure, say N. | 78 | If unsure, say N. |
79 | 79 | ||
80 | config SCSI_SATA_SX4 | 80 | config SATA_SX4 |
81 | tristate "Promise SATA SX4 support" | 81 | tristate "Promise SATA SX4 support" |
82 | depends on ATA && PCI && EXPERIMENTAL | 82 | depends on ATA && PCI && EXPERIMENTAL |
83 | help | 83 | help |
@@ -85,7 +85,7 @@ config SCSI_SATA_SX4 | |||
85 | 85 | ||
86 | If unsure, say N. | 86 | If unsure, say N. |
87 | 87 | ||
88 | config SCSI_SATA_SIL | 88 | config SATA_SIL |
89 | tristate "Silicon Image SATA support" | 89 | tristate "Silicon Image SATA support" |
90 | depends on ATA && PCI | 90 | depends on ATA && PCI |
91 | help | 91 | help |
@@ -93,7 +93,7 @@ config SCSI_SATA_SIL | |||
93 | 93 | ||
94 | If unsure, say N. | 94 | If unsure, say N. |
95 | 95 | ||
96 | config SCSI_SATA_SIL24 | 96 | config SATA_SIL24 |
97 | tristate "Silicon Image 3124/3132 SATA support" | 97 | tristate "Silicon Image 3124/3132 SATA support" |
98 | depends on ATA && PCI | 98 | depends on ATA && PCI |
99 | help | 99 | help |
@@ -101,7 +101,7 @@ config SCSI_SATA_SIL24 | |||
101 | 101 | ||
102 | If unsure, say N. | 102 | If unsure, say N. |
103 | 103 | ||
104 | config SCSI_SATA_SIS | 104 | config SATA_SIS |
105 | tristate "SiS 964/180 SATA support" | 105 | tristate "SiS 964/180 SATA support" |
106 | depends on ATA && PCI | 106 | depends on ATA && PCI |
107 | help | 107 | help |
@@ -109,7 +109,7 @@ config SCSI_SATA_SIS | |||
109 | 109 | ||
110 | If unsure, say N. | 110 | If unsure, say N. |
111 | 111 | ||
112 | config SCSI_SATA_ULI | 112 | config SATA_ULI |
113 | tristate "ULi Electronics SATA support" | 113 | tristate "ULi Electronics SATA support" |
114 | depends on ATA && PCI | 114 | depends on ATA && PCI |
115 | help | 115 | help |
@@ -117,7 +117,7 @@ config SCSI_SATA_ULI | |||
117 | 117 | ||
118 | If unsure, say N. | 118 | If unsure, say N. |
119 | 119 | ||
120 | config SCSI_SATA_VIA | 120 | config SATA_VIA |
121 | tristate "VIA SATA support" | 121 | tristate "VIA SATA support" |
122 | depends on ATA && PCI | 122 | depends on ATA && PCI |
123 | help | 123 | help |
@@ -125,7 +125,7 @@ config SCSI_SATA_VIA | |||
125 | 125 | ||
126 | If unsure, say N. | 126 | If unsure, say N. |
127 | 127 | ||
128 | config SCSI_SATA_VITESSE | 128 | config SATA_VITESSE |
129 | tristate "VITESSE VSC-7174 / INTEL 31244 SATA support" | 129 | tristate "VITESSE VSC-7174 / INTEL 31244 SATA support" |
130 | depends on ATA && PCI | 130 | depends on ATA && PCI |
131 | help | 131 | help |
@@ -133,8 +133,8 @@ config SCSI_SATA_VITESSE | |||
133 | 133 | ||
134 | If unsure, say N. | 134 | If unsure, say N. |
135 | 135 | ||
136 | config SCSI_SATA_INTEL_COMBINED | 136 | config SATA_INTEL_COMBINED |
137 | bool | 137 | bool |
138 | depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX) | 138 | depends on IDE=y && !BLK_DEV_IDE_SATA && (SATA_AHCI || ATA_PIIX) |
139 | default y | 139 | default y |
140 | 140 | ||
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 60bdb7b2b5ca..b19a773cef71 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile | |||
@@ -1,19 +1,19 @@ | |||
1 | 1 | ||
2 | obj-$(CONFIG_SCSI_SATA_AHCI) += libata.o ahci.o | 2 | obj-$(CONFIG_SATA_AHCI) += libata.o ahci.o |
3 | obj-$(CONFIG_SCSI_SATA_SVW) += libata.o sata_svw.o | 3 | obj-$(CONFIG_SATA_SVW) += libata.o sata_svw.o |
4 | obj-$(CONFIG_SCSI_ATA_PIIX) += libata.o ata_piix.o | 4 | obj-$(CONFIG_ATA_PIIX) += libata.o ata_piix.o |
5 | obj-$(CONFIG_SCSI_SATA_PROMISE) += libata.o sata_promise.o | 5 | obj-$(CONFIG_SATA_PROMISE) += libata.o sata_promise.o |
6 | obj-$(CONFIG_SCSI_SATA_QSTOR) += libata.o sata_qstor.o | 6 | obj-$(CONFIG_SATA_QSTOR) += libata.o sata_qstor.o |
7 | obj-$(CONFIG_SCSI_SATA_SIL) += libata.o sata_sil.o | 7 | obj-$(CONFIG_SATA_SIL) += libata.o sata_sil.o |
8 | obj-$(CONFIG_SCSI_SATA_SIL24) += libata.o sata_sil24.o | 8 | obj-$(CONFIG_SATA_SIL24) += libata.o sata_sil24.o |
9 | obj-$(CONFIG_SCSI_SATA_VIA) += libata.o sata_via.o | 9 | obj-$(CONFIG_SATA_VIA) += libata.o sata_via.o |
10 | obj-$(CONFIG_SCSI_SATA_VITESSE) += libata.o sata_vsc.o | 10 | obj-$(CONFIG_SATA_VITESSE) += libata.o sata_vsc.o |
11 | obj-$(CONFIG_SCSI_SATA_SIS) += libata.o sata_sis.o | 11 | obj-$(CONFIG_SATA_SIS) += libata.o sata_sis.o |
12 | obj-$(CONFIG_SCSI_SATA_SX4) += libata.o sata_sx4.o | 12 | obj-$(CONFIG_SATA_SX4) += libata.o sata_sx4.o |
13 | obj-$(CONFIG_SCSI_SATA_NV) += libata.o sata_nv.o | 13 | obj-$(CONFIG_SATA_NV) += libata.o sata_nv.o |
14 | obj-$(CONFIG_SCSI_SATA_ULI) += libata.o sata_uli.o | 14 | obj-$(CONFIG_SATA_ULI) += libata.o sata_uli.o |
15 | obj-$(CONFIG_SCSI_SATA_MV) += libata.o sata_mv.o | 15 | obj-$(CONFIG_SATA_MV) += libata.o sata_mv.o |
16 | obj-$(CONFIG_SCSI_PDC_ADMA) += libata.o pdc_adma.o | 16 | obj-$(CONFIG_PDC_ADMA) += libata.o pdc_adma.o |
17 | 17 | ||
18 | libata-objs := libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o | 18 | libata-objs := libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o |
19 | 19 | ||