mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-23 13:09:04 -04:00
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
This commit is contained in:
commit
901ea4a079
7 changed files with 751 additions and 1 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue