diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 00:23:50 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 00:23:50 +0300 |
| commit | 901ea4a07988043ff8c6f4f275ab680a23b8bbcd (patch) | |
| tree | 9301cf0d28e8f6b58e5ed1458eca7e3a95906a9c /include | |
| parent | 2370965c5065b24b28b5ba09b60ddfbfb6d7649b (diff) | |
| parent | 9de1cc9c446d39546a3d9dd6f7d99a980a7ecc22 (diff) | |
| download | linux-901ea4a07988043ff8c6f4f275ab680a23b8bbcd.tar.xz | |
Merge branch 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[PATCH] libata: wrong sizeof for BUFFER
[PATCH] libata: change order of _SDD/_GTF execution (resend #3)
[PATCH] libata: ACPI _SDD support
[PATCH] libata: ACPI and _GTF support
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index b870b20df43c..86762a9f52ba 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -35,6 +35,7 @@ #include <linux/ata.h> #include <linux/workqueue.h> #include <scsi/scsi_host.h> +#include <linux/acpi.h> /* * Define if arch has non-standard setup. This is a _PCI_ standard @@ -495,6 +496,10 @@ struct ata_device { /* error history */ struct ata_ering ering; unsigned int horkage; /* List of broken features */ +#ifdef CONFIG_SATA_ACPI + /* ACPI objects info */ + acpi_handle obj_handle; +#endif }; /* Offset into struct ata_device. Fields above it are maintained |