From: Randy Dunlap <randy_d_dunlap@linux.intel.com>

Add ata_acpi in Makefile and Kconfig.
Add ACPI obj_handle.
Add ata_acpi.c to libata kernel-doc template file.

Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 Documentation/DocBook/libata.tmpl |    6 ++++++
 drivers/scsi/Kconfig              |    5 +++++
 drivers/scsi/Makefile             |    3 +++
 include/linux/libata.h            |    6 ++++++
 4 files changed, 20 insertions(+)

diff -puN Documentation/DocBook/libata.tmpl~sata-acpi-build Documentation/DocBook/libata.tmpl
--- devel/Documentation/DocBook/libata.tmpl~sata-acpi-build	2006-01-13 22:55:26.000000000 -0800
+++ devel-akpm/Documentation/DocBook/libata.tmpl	2006-01-13 22:55:26.000000000 -0800
@@ -787,6 +787,12 @@ and other resources, etc.
 !Idrivers/scsi/libata-scsi.c
   </chapter>
 
+  <chapter id="libataAcpi">
+     <title>libata ACPI interfaces/methods</title>
+!Edrivers/scsi/ata_acpi.c
+!Idrivers/scsi/ata_acpi.c
+  </chapter>
+
   <chapter id="ataExceptions">
      <title>ATA errors &amp; exceptions</title>
 
diff -puN drivers/scsi/Kconfig~sata-acpi-build drivers/scsi/Kconfig
--- devel/drivers/scsi/Kconfig~sata-acpi-build	2006-01-13 22:55:26.000000000 -0800
+++ devel-akpm/drivers/scsi/Kconfig	2006-01-13 22:55:26.000000000 -0800
@@ -599,6 +599,11 @@ config SCSI_SATA_INTEL_COMBINED
 	depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX)
 	default y
 
+config SCSI_SATA_ACPI
+	bool
+	depends on SCSI_SATA && ACPI
+	default y
+
 config SCSI_BUSLOGIC
 	tristate "BusLogic SCSI support"
 	depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
diff -puN drivers/scsi/Makefile~sata-acpi-build drivers/scsi/Makefile
--- devel/drivers/scsi/Makefile~sata-acpi-build	2006-01-13 22:55:26.000000000 -0800
+++ devel-akpm/drivers/scsi/Makefile	2006-01-13 22:55:26.000000000 -0800
@@ -164,6 +164,9 @@ CFLAGS_ncr53c8xx.o	:= $(ncr53c8xx-flags-
 zalon7xx-objs	:= zalon.o ncr53c8xx.o
 NCR_Q720_mod-objs	:= NCR_Q720.o ncr53c8xx.o
 libata-objs	:= libata-core.o libata-scsi.o
+ifeq ($(CONFIG_SCSI_SATA_ACPI),y)
+  libata-objs	+= libata-acpi.o
+endif
 oktagon_esp_mod-objs	:= oktagon_esp.o oktagon_io.o
 
 # Files generated that shall be removed upon make clean
diff -puN include/linux/libata.h~sata-acpi-build include/linux/libata.h
--- devel/include/linux/libata.h~sata-acpi-build	2006-01-13 22:55:26.000000000 -0800
+++ devel-akpm/include/linux/libata.h	2006-01-13 22:55:26.000000000 -0800
@@ -33,6 +33,7 @@
 #include <asm/io.h>
 #include <linux/ata.h>
 #include <linux/workqueue.h>
+#include <acpi/acpi.h>
 
 /*
  * compile-time options
@@ -315,6 +316,11 @@ struct ata_device {
 	u16			cylinders;	/* Number of cylinders */
 	u16			heads;		/* Number of heads */
 	u16			sectors;	/* Number of sectors per track */
+
+#ifdef CONFIG_SCSI_SATA_ACPI
+	/* ACPI objects info */
+	acpi_handle		obj_handle;
+#endif
 };
 
 struct ata_port {
_