ACPI: Move drivers/acpi/include directory to include/acpi

drivers/acpi/Makefile

@@ -4,7 +4,7 @@
 
 export ACPI_CFLAGS
 
-ACPI_CFLAGS	:= -D_LINUX -Idrivers/acpi/include
+ACPI_CFLAGS	:= -D_LINUX -Iinclude/acpi
 
 ifdef CONFIG_ACPI_DEBUG
   ACPI_CFLAGS	+= -DACPI_DEBUG_OUTPUT

drivers/acpi/acpi_bus.h

@@ -29,7 +29,7 @@
 #include <linux/version.h>
 #include <linux/kobject.h>
 
-#include "include/acpi.h"
+#include <acpi/acpi.h>
 
 #define PREFIX			"ACPI: "
 

drivers/acpi/acpi_ksyms.c

@@ -25,7 +25,7 @@
 
 #include <linux/module.h>
 #include <linux/acpi.h>
-#include "include/acpi.h"
+#include <acpi/acpi.h>
 #include "acpi_bus.h"
 
 

drivers/acpi/osl.c

@@ -35,9 +35,9 @@
 #include <linux/kmod.h>
 #include <linux/delay.h>
 #include <linux/workqueue.h>
+#include <acpi/acpi.h>
 #include <asm/io.h>
 #include "acpi_bus.h"
-#include "acpi.h"
 
 #ifdef CONFIG_ACPI_EFI
 #include <linux/efi.h>

drivers/acpi/scan.c

@@ -6,7 +6,7 @@
 #include <linux/acpi.h>
 
 #include "acpi_drivers.h"
-#include "include/acinterp.h"	/* for acpi_ex_eisa_id_to_string() */
+#include <acpi/acinterp.h>	/* for acpi_ex_eisa_id_to_string() */
 
 
 #define _COMPONENT		ACPI_BUS_COMPONENT

drivers/hotplug/acpiphp.h

@@ -34,7 +34,7 @@
 #ifndef _ACPIPHP_H
 #define _ACPIPHP_H
 
-#include "include/acpi.h"
+#include <linux/acpi.h>
 #include "pci_hotplug.h"
 #include "acpi_bus.h"
 

include/linux/acpi.h

@@ -31,11 +31,7 @@
 
 #include <linux/list.h>
 
-/*
- * Yes this is ugly, but moving all of ACPI's private headers to include/acpi 
- * isn't the right answer either.  Please just ignore it for now.
- */
-#include "../../drivers/acpi/include/acpi.h"
+#include <acpi/acpi.h>
 #include <asm/acpi.h>