Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
c6fd2807
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c6fd2807
编写于
8月 10, 2006
作者:
J
Jeff Garzik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move libata to drivers/ata.
上级
79ed35a9
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
163 addition
and
156 deletion
+163
-156
drivers/Kconfig
drivers/Kconfig
+2
-0
drivers/Makefile
drivers/Makefile
+1
-0
drivers/ata/Kconfig
drivers/ata/Kconfig
+140
-0
drivers/ata/Makefile
drivers/ata/Makefile
+19
-0
drivers/ata/ahci.c
drivers/ata/ahci.c
+0
-0
drivers/ata/ata_piix.c
drivers/ata/ata_piix.c
+0
-0
drivers/ata/libata-bmdma.c
drivers/ata/libata-bmdma.c
+0
-0
drivers/ata/libata-core.c
drivers/ata/libata-core.c
+0
-1
drivers/ata/libata-eh.c
drivers/ata/libata-eh.c
+1
-1
drivers/ata/libata-scsi.c
drivers/ata/libata-scsi.c
+0
-0
drivers/ata/libata.h
drivers/ata/libata.h
+0
-0
drivers/ata/pdc_adma.c
drivers/ata/pdc_adma.c
+0
-0
drivers/ata/sata_mv.c
drivers/ata/sata_mv.c
+0
-0
drivers/ata/sata_nv.c
drivers/ata/sata_nv.c
+0
-0
drivers/ata/sata_promise.c
drivers/ata/sata_promise.c
+0
-0
drivers/ata/sata_promise.h
drivers/ata/sata_promise.h
+0
-0
drivers/ata/sata_qstor.c
drivers/ata/sata_qstor.c
+0
-0
drivers/ata/sata_sil.c
drivers/ata/sata_sil.c
+0
-0
drivers/ata/sata_sil24.c
drivers/ata/sata_sil24.c
+0
-0
drivers/ata/sata_sis.c
drivers/ata/sata_sis.c
+0
-0
drivers/ata/sata_svw.c
drivers/ata/sata_svw.c
+0
-0
drivers/ata/sata_sx4.c
drivers/ata/sata_sx4.c
+0
-0
drivers/ata/sata_uli.c
drivers/ata/sata_uli.c
+0
-0
drivers/ata/sata_via.c
drivers/ata/sata_via.c
+0
-0
drivers/ata/sata_vsc.c
drivers/ata/sata_vsc.c
+0
-0
drivers/scsi/Kconfig
drivers/scsi/Kconfig
+0
-138
drivers/scsi/Makefile
drivers/scsi/Makefile
+0
-16
未找到文件。
drivers/Kconfig
浏览文件 @
c6fd2807
...
...
@@ -18,6 +18,8 @@ source "drivers/ide/Kconfig"
source "drivers/scsi/Kconfig"
source "drivers/ata/Kconfig"
source "drivers/cdrom/Kconfig"
source "drivers/md/Kconfig"
...
...
drivers/Makefile
浏览文件 @
c6fd2807
...
...
@@ -34,6 +34,7 @@ obj-$(CONFIG_PPC_PMAC) += macintosh/
obj-$(CONFIG_IDE)
+=
ide/
obj-$(CONFIG_FC4)
+=
fc4/
obj-$(CONFIG_SCSI)
+=
scsi/
obj-$(CONFIG_ATA)
+=
ata/
obj-$(CONFIG_FUSION)
+=
message/
obj-$(CONFIG_IEEE1394)
+=
ieee1394/
obj-y
+=
cdrom/
...
...
drivers/ata/Kconfig
0 → 100644
浏览文件 @
c6fd2807
config ATA
tristate "ATA device support"
depends on SCSI
---help---
If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
any other ATA device under Linux, say Y and make sure that you know
the name of your ATA host adapter (the card inside your computer
that "speaks" the ATA protocol, also called ATA controller),
because you will be asked for it.
config SCSI_SATA_AHCI
tristate "AHCI SATA support"
depends on ATA && PCI
help
This option enables support for AHCI Serial ATA.
If unsure, say N.
config SCSI_SATA_SVW
tristate "ServerWorks Frodo / Apple K2 SATA support"
depends on ATA && PCI
help
This option enables support for Broadcom/Serverworks/Apple K2
SATA support.
If unsure, say N.
config SCSI_ATA_PIIX
tristate "Intel PIIX/ICH SATA support"
depends on ATA && PCI
help
This option enables support for ICH5/6/7/8 Serial ATA.
If PATA support was enabled previously, this enables
support for select Intel PIIX/ICH PATA host controllers.
If unsure, say N.
config SCSI_SATA_MV
tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)"
depends on ATA && PCI && EXPERIMENTAL
help
This option enables support for the Marvell Serial ATA family.
Currently supports 88SX[56]0[48][01] chips.
If unsure, say N.
config SCSI_SATA_NV
tristate "NVIDIA SATA support"
depends on ATA && PCI
help
This option enables support for NVIDIA Serial ATA.
If unsure, say N.
config SCSI_PDC_ADMA
tristate "Pacific Digital ADMA support"
depends on ATA && PCI
help
This option enables support for Pacific Digital ADMA controllers
If unsure, say N.
config SCSI_SATA_QSTOR
tristate "Pacific Digital SATA QStor support"
depends on ATA && PCI
help
This option enables support for Pacific Digital Serial ATA QStor.
If unsure, say N.
config SCSI_SATA_PROMISE
tristate "Promise SATA TX2/TX4 support"
depends on ATA && PCI
help
This option enables support for Promise Serial ATA TX2/TX4.
If unsure, say N.
config SCSI_SATA_SX4
tristate "Promise SATA SX4 support"
depends on ATA && PCI && EXPERIMENTAL
help
This option enables support for Promise Serial ATA SX4.
If unsure, say N.
config SCSI_SATA_SIL
tristate "Silicon Image SATA support"
depends on ATA && PCI
help
This option enables support for Silicon Image Serial ATA.
If unsure, say N.
config SCSI_SATA_SIL24
tristate "Silicon Image 3124/3132 SATA support"
depends on ATA && PCI
help
This option enables support for Silicon Image 3124/3132 Serial ATA.
If unsure, say N.
config SCSI_SATA_SIS
tristate "SiS 964/180 SATA support"
depends on ATA && PCI
help
This option enables support for SiS Serial ATA 964/180.
If unsure, say N.
config SCSI_SATA_ULI
tristate "ULi Electronics SATA support"
depends on ATA && PCI
help
This option enables support for ULi Electronics SATA.
If unsure, say N.
config SCSI_SATA_VIA
tristate "VIA SATA support"
depends on ATA && PCI
help
This option enables support for VIA Serial ATA.
If unsure, say N.
config SCSI_SATA_VITESSE
tristate "VITESSE VSC-7174 / INTEL 31244 SATA support"
depends on ATA && PCI
help
This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA.
If unsure, say N.
config SCSI_SATA_INTEL_COMBINED
bool
depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX)
default y
drivers/ata/Makefile
0 → 100644
浏览文件 @
c6fd2807
obj-$(CONFIG_SCSI_SATA_AHCI)
+=
libata.o ahci.o
obj-$(CONFIG_SCSI_SATA_SVW)
+=
libata.o sata_svw.o
obj-$(CONFIG_SCSI_ATA_PIIX)
+=
libata.o ata_piix.o
obj-$(CONFIG_SCSI_SATA_PROMISE)
+=
libata.o sata_promise.o
obj-$(CONFIG_SCSI_SATA_QSTOR)
+=
libata.o sata_qstor.o
obj-$(CONFIG_SCSI_SATA_SIL)
+=
libata.o sata_sil.o
obj-$(CONFIG_SCSI_SATA_SIL24)
+=
libata.o sata_sil24.o
obj-$(CONFIG_SCSI_SATA_VIA)
+=
libata.o sata_via.o
obj-$(CONFIG_SCSI_SATA_VITESSE)
+=
libata.o sata_vsc.o
obj-$(CONFIG_SCSI_SATA_SIS)
+=
libata.o sata_sis.o
obj-$(CONFIG_SCSI_SATA_SX4)
+=
libata.o sata_sx4.o
obj-$(CONFIG_SCSI_SATA_NV)
+=
libata.o sata_nv.o
obj-$(CONFIG_SCSI_SATA_ULI)
+=
libata.o sata_uli.o
obj-$(CONFIG_SCSI_SATA_MV)
+=
libata.o sata_mv.o
obj-$(CONFIG_SCSI_PDC_ADMA)
+=
libata.o pdc_adma.o
libata-objs
:=
libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o
drivers/
scsi
/ahci.c
→
drivers/
ata
/ahci.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/ata_piix.c
→
drivers/
ata
/ata_piix.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/libata-bmdma.c
→
drivers/
ata
/libata-bmdma.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/libata-core.c
→
drivers/
ata
/libata-core.c
浏览文件 @
c6fd2807
...
...
@@ -50,7 +50,6 @@
#include <linux/jiffies.h>
#include <linux/scatterlist.h>
#include <scsi/scsi.h>
#include "scsi_priv.h"
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_host.h>
#include <linux/libata.h>
...
...
drivers/
scsi
/libata-eh.c
→
drivers/
ata
/libata-eh.c
浏览文件 @
c6fd2807
...
...
@@ -39,7 +39,7 @@
#include <scsi/scsi_eh.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_cmnd.h>
#include "scsi_transport_api.h"
#include "
../scsi/
scsi_transport_api.h"
#include <linux/libata.h>
...
...
drivers/
scsi
/libata-scsi.c
→
drivers/
ata
/libata-scsi.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/libata.h
→
drivers/
ata
/libata.h
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/pdc_adma.c
→
drivers/
ata
/pdc_adma.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_mv.c
→
drivers/
ata
/sata_mv.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_nv.c
→
drivers/
ata
/sata_nv.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_promise.c
→
drivers/
ata
/sata_promise.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_promise.h
→
drivers/
ata
/sata_promise.h
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_qstor.c
→
drivers/
ata
/sata_qstor.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_sil.c
→
drivers/
ata
/sata_sil.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_sil24.c
→
drivers/
ata
/sata_sil24.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_sis.c
→
drivers/
ata
/sata_sis.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_svw.c
→
drivers/
ata
/sata_svw.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_sx4.c
→
drivers/
ata
/sata_sx4.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_uli.c
→
drivers/
ata
/sata_uli.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_via.c
→
drivers/
ata
/sata_via.c
浏览文件 @
c6fd2807
文件已移动
drivers/
scsi
/sata_vsc.c
→
drivers/
ata
/sata_vsc.c
浏览文件 @
c6fd2807
文件已移动
drivers/scsi/Kconfig
浏览文件 @
c6fd2807
...
...
@@ -471,67 +471,6 @@ config SCSI_IN2000
source "drivers/scsi/megaraid/Kconfig.megaraid"
config SCSI_SATA
tristate "Serial ATA (SATA) support"
depends on SCSI
help
This driver family supports Serial ATA host controllers
and devices.
If unsure, say N.
config SCSI_SATA_AHCI
tristate "AHCI SATA support"
depends on SCSI_SATA && PCI
help
This option enables support for AHCI Serial ATA.
If unsure, say N.
config SCSI_SATA_SVW
tristate "ServerWorks Frodo / Apple K2 SATA support"
depends on SCSI_SATA && PCI
help
This option enables support for Broadcom/Serverworks/Apple K2
SATA support.
If unsure, say N.
config SCSI_ATA_PIIX
tristate "Intel PIIX/ICH SATA support"
depends on SCSI_SATA && PCI
help
This option enables support for ICH5/6/7/8 Serial ATA.
If PATA support was enabled previously, this enables
support for select Intel PIIX/ICH PATA host controllers.
If unsure, say N.
config SCSI_SATA_MV
tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)"
depends on SCSI_SATA && PCI && EXPERIMENTAL
help
This option enables support for the Marvell Serial ATA family.
Currently supports 88SX[56]0[48][01] chips.
If unsure, say N.
config SCSI_SATA_NV
tristate "NVIDIA SATA support"
depends on SCSI_SATA && PCI && EXPERIMENTAL
help
This option enables support for NVIDIA Serial ATA.
If unsure, say N.
config SCSI_PDC_ADMA
tristate "Pacific Digital ADMA support"
depends on SCSI_SATA && PCI
help
This option enables support for Pacific Digital ADMA controllers
If unsure, say N.
config SCSI_HPTIOP
tristate "HighPoint RocketRAID 3xxx Controller support"
depends on SCSI && PCI
...
...
@@ -542,83 +481,6 @@ config SCSI_HPTIOP
To compile this driver as a module, choose M here; the module
will be called hptiop. If unsure, say N.
config SCSI_SATA_QSTOR
tristate "Pacific Digital SATA QStor support"
depends on SCSI_SATA && PCI
help
This option enables support for Pacific Digital Serial ATA QStor.
If unsure, say N.
config SCSI_SATA_PROMISE
tristate "Promise SATA TX2/TX4 support"
depends on SCSI_SATA && PCI
help
This option enables support for Promise Serial ATA TX2/TX4.
If unsure, say N.
config SCSI_SATA_SX4
tristate "Promise SATA SX4 support"
depends on SCSI_SATA && PCI && EXPERIMENTAL
help
This option enables support for Promise Serial ATA SX4.
If unsure, say N.
config SCSI_SATA_SIL
tristate "Silicon Image SATA support"
depends on SCSI_SATA && PCI && EXPERIMENTAL
help
This option enables support for Silicon Image Serial ATA.
If unsure, say N.
config SCSI_SATA_SIL24
tristate "Silicon Image 3124/3132 SATA support"
depends on SCSI_SATA && PCI && EXPERIMENTAL
help
This option enables support for Silicon Image 3124/3132 Serial ATA.
If unsure, say N.
config SCSI_SATA_SIS
tristate "SiS 964/180 SATA support"
depends on SCSI_SATA && PCI && EXPERIMENTAL
help
This option enables support for SiS Serial ATA 964/180.
If unsure, say N.
config SCSI_SATA_ULI
tristate "ULi Electronics SATA support"
depends on SCSI_SATA && PCI && EXPERIMENTAL
help
This option enables support for ULi Electronics SATA.
If unsure, say N.
config SCSI_SATA_VIA
tristate "VIA SATA support"
depends on SCSI_SATA && PCI
help
This option enables support for VIA Serial ATA.
If unsure, say N.
config SCSI_SATA_VITESSE
tristate "VITESSE VSC-7174 / INTEL 31244 SATA support"
depends on SCSI_SATA && PCI
help
This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA.
If unsure, say N.
config SCSI_SATA_INTEL_COMBINED
bool
depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX)
default y
config SCSI_BUSLOGIC
tristate "BusLogic SCSI support"
depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
...
...
drivers/scsi/Makefile
浏览文件 @
c6fd2807
...
...
@@ -122,21 +122,6 @@ obj-$(CONFIG_SCSI_LASI700) += 53c700.o lasi700.o
obj-$(CONFIG_SCSI_NSP32)
+=
nsp32.o
obj-$(CONFIG_SCSI_IPR)
+=
ipr.o
obj-$(CONFIG_SCSI_IBMVSCSI)
+=
ibmvscsi/
obj-$(CONFIG_SCSI_SATA_AHCI)
+=
libata.o ahci.o
obj-$(CONFIG_SCSI_SATA_SVW)
+=
libata.o sata_svw.o
obj-$(CONFIG_SCSI_ATA_PIIX)
+=
libata.o ata_piix.o
obj-$(CONFIG_SCSI_SATA_PROMISE)
+=
libata.o sata_promise.o
obj-$(CONFIG_SCSI_SATA_QSTOR)
+=
libata.o sata_qstor.o
obj-$(CONFIG_SCSI_SATA_SIL)
+=
libata.o sata_sil.o
obj-$(CONFIG_SCSI_SATA_SIL24)
+=
libata.o sata_sil24.o
obj-$(CONFIG_SCSI_SATA_VIA)
+=
libata.o sata_via.o
obj-$(CONFIG_SCSI_SATA_VITESSE)
+=
libata.o sata_vsc.o
obj-$(CONFIG_SCSI_SATA_SIS)
+=
libata.o sata_sis.o
obj-$(CONFIG_SCSI_SATA_SX4)
+=
libata.o sata_sx4.o
obj-$(CONFIG_SCSI_SATA_NV)
+=
libata.o sata_nv.o
obj-$(CONFIG_SCSI_SATA_ULI)
+=
libata.o sata_uli.o
obj-$(CONFIG_SCSI_SATA_MV)
+=
libata.o sata_mv.o
obj-$(CONFIG_SCSI_PDC_ADMA)
+=
libata.o pdc_adma.o
obj-$(CONFIG_SCSI_HPTIOP)
+=
hptiop.o
obj-$(CONFIG_ARM)
+=
arm/
...
...
@@ -166,7 +151,6 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \
CFLAGS_ncr53c8xx.o
:=
$
(
ncr53c8xx-flags-y
)
$
(
ncr53c8xx-flags-m
)
zalon7xx-objs
:=
zalon.o ncr53c8xx.o
NCR_Q720_mod-objs
:=
NCR_Q720.o ncr53c8xx.o
libata-objs
:=
libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o
oktagon_esp_mod-objs
:=
oktagon_esp.o oktagon_io.o
# Files generated that shall be removed upon make clean
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录