diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:08 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:08 -0500 |
| commit | c088f4e9da74b901f7ed1749ad697d77622ed0f9 (patch) | |
| tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /drivers/ata/libata-acpi.c | |
| parent | ce79735c12d62c3cda38eb31762cf98e87c7b087 (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ata/libata-acpi.c')
| -rw-r--r-- | drivers/ata/libata-acpi.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index ef02e488d468..6273d98d00eb 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
| @@ -19,12 +19,6 @@ | |||
| 19 | #include "libata.h" | 19 | #include "libata.h" |
| 20 | 20 | ||
| 21 | #include <acpi/acpi_bus.h> | 21 | #include <acpi/acpi_bus.h> |
| 22 | #include <acpi/acnames.h> | ||
| 23 | #include <acpi/acnamesp.h> | ||
| 24 | #include <acpi/acparser.h> | ||
| 25 | #include <acpi/acexcep.h> | ||
| 26 | #include <acpi/acmacros.h> | ||
| 27 | #include <acpi/actypes.h> | ||
| 28 | 22 | ||
| 29 | enum { | 23 | enum { |
| 30 | ATA_ACPI_FILTER_SETXFER = 1 << 0, | 24 | ATA_ACPI_FILTER_SETXFER = 1 << 0, |