diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:51 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 00:29:51 -0500 |
| commit | cb7a97d01521797cad9f63e8478403c3e51fea49 (patch) | |
| tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /drivers/ide | |
| parent | 0335cb76aa3fa913a2164bc9b669e5aef9d56fa3 (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-acpi.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index 2f9e941968d6..d8f295bdad76 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c | |||
| @@ -18,12 +18,6 @@ | |||
| 18 | #include <linux/dmi.h> | 18 | #include <linux/dmi.h> |
| 19 | 19 | ||
| 20 | #include <acpi/acpi_bus.h> | 20 | #include <acpi/acpi_bus.h> |
| 21 | #include <acpi/acnames.h> | ||
| 22 | #include <acpi/acnamesp.h> | ||
| 23 | #include <acpi/acparser.h> | ||
| 24 | #include <acpi/acexcep.h> | ||
| 25 | #include <acpi/acmacros.h> | ||
| 26 | #include <acpi/actypes.h> | ||
| 27 | 21 | ||
| 28 | #define REGS_PER_GTF 7 | 22 | #define REGS_PER_GTF 7 |
| 29 | struct taskfile_array { | 23 | struct taskfile_array { |