---

yaml
---
r: 35423
b: refs/heads/master
c: cb60736
h: refs/heads/master
i:
  35421: 857c89c
  35419: 1d491cb
  35415: ffd03aa
  35407: b8fcb17
  35391: bbed0aa
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b68c5f546e951d718edf611c4bd9853753e4b366
+refs/heads/master: cb60736b32a84cbc9525b0bb4df26b04cbfbc8e8

trunk/Documentation/DocBook/libata.tmpl

@@ -868,18 +868,18 @@ and other resources, etc.
 
   <chapter id="libataExt">
      <title>libata Library</title>
-!Edrivers/ata/libata-core.c
+!Edrivers/scsi/libata-core.c
   </chapter>
 
   <chapter id="libataInt">
      <title>libata Core Internals</title>
-!Idrivers/ata/libata-core.c
+!Idrivers/scsi/libata-core.c
   </chapter>
 
   <chapter id="libataScsiInt">
      <title>libata SCSI translation/emulation</title>
-!Edrivers/ata/libata-scsi.c
-!Idrivers/ata/libata-scsi.c
+!Edrivers/scsi/libata-scsi.c
+!Idrivers/scsi/libata-scsi.c
   </chapter>
 
   <chapter id="ataExceptions">
@@ -1600,12 +1600,12 @@ and other resources, etc.
 
   <chapter id="PiixInt">
      <title>ata_piix Internals</title>
-!Idrivers/ata/ata_piix.c
+!Idrivers/scsi/ata_piix.c
   </chapter>
 
   <chapter id="SILInt">
      <title>sata_sil Internals</title>
-!Idrivers/ata/sata_sil.c
+!Idrivers/scsi/sata_sil.c
   </chapter>
 
   <chapter id="libataThanks">

trunk/drivers/Kconfig

@@ -18,8 +18,6 @@ source "drivers/ide/Kconfig"
 
 source "drivers/scsi/Kconfig"
 
-source "drivers/ata/Kconfig"
-
 source "drivers/cdrom/Kconfig"
 
 source "drivers/md/Kconfig"

trunk/drivers/Makefile

@@ -34,7 +34,6 @@ 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/