Browse Source

ACPI: linux/acpi.h should not include linux/dmi.h

users of acpi.h that need dmi.h should include it directly.

Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown 16 years ago
parent
commit
eb27cae8ad
6 changed files with 5 additions and 3 deletions
  1. 1 0
      drivers/acpi/bus.c
  2. 1 0
      drivers/acpi/ec.c
  3. 1 0
      drivers/acpi/pci_slot.c
  4. 1 1
      drivers/acpi/video.c
  5. 1 0
      drivers/pci/dmar.c
  6. 0 2
      include/linux/acpi.h

+ 1 - 0
drivers/acpi/bus.c

@@ -38,6 +38,7 @@
 #include <linux/pci.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <linux/dmi.h>
 
 #include "internal.h"
 

+ 1 - 0
drivers/acpi/ec.c

@@ -42,6 +42,7 @@
 #include <asm/io.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <linux/dmi.h>
 
 #define ACPI_EC_CLASS			"embedded_controller"
 #define ACPI_EC_DEVICE_NAME		"Embedded Controller"

+ 1 - 0
drivers/acpi/pci_slot.c

@@ -31,6 +31,7 @@
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
+#include <linux/dmi.h>
 
 static int debug;
 static int check_sta_before_sun;

+ 1 - 1
drivers/acpi/video.c

@@ -40,7 +40,7 @@
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <asm/uaccess.h>
-
+#include <linux/dmi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 

+ 1 - 0
drivers/pci/dmar.c

@@ -33,6 +33,7 @@
 #include <linux/timer.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/dmi.h>
 
 #undef PREFIX
 #define PREFIX "DMAR:"

+ 0 - 2
include/linux/acpi.h

@@ -41,8 +41,6 @@
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_numa.h>
 #include <asm/acpi.h>
-#include <linux/dmi.h>
-
 
 enum acpi_irq_model_id {
 	ACPI_IRQ_MODEL_PIC = 0,