Merge branch 'linus' into release

[linux-2.6.git] / drivers / ata / libata-acpi.c

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index ef02e488d468880a6af3dc624fbf854685dc730e..6273d98d00ebc6f200f470dbbe856b5181b9a7c4 100644 (file)
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -19,12 +19,6 @@
 #include "libata.h"
 
 #include <acpi/acpi_bus.h>
 #include "libata.h"
 
 #include <acpi/acpi_bus.h>

-#include <acpi/acnames.h>
-#include <acpi/acnamesp.h>
-#include <acpi/acparser.h>
-#include <acpi/acexcep.h>
-#include <acpi/acmacros.h>
-#include <acpi/actypes.h>

 
 enum {
        ATA_ACPI_FILTER_SETXFER = 1 << 0,
 
 enum {
        ATA_ACPI_FILTER_SETXFER = 1 << 0,