ACPI: fix conflicting component definitions

Some of the component definitions that were previous scattered around
the drivers conflict with each other.  That doesn't hurt anything
except that setting one bit in the debug_layer mask would turn on
debugging in two different modules.  This patch fixes the conflicts.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 8778a3a00bcb2d92275c0a4d05a8b4885b5cbe0b..414a6ccdc04264845d61a5470811523984b6e933 100644 (file)
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -35,16 +35,16 @@
 #define ACPI_AC_COMPONENT              0x00020000
 #define ACPI_BATTERY_COMPONENT         0x00040000
 #define ACPI_BUTTON_COMPONENT          0x00080000
-#define ACPI_SBS_COMPONENT             0x00080000
+#define ACPI_SBS_COMPONENT             0x00100000
 #define ACPI_FAN_COMPONENT             0x00200000
 #define ACPI_PCI_COMPONENT             0x00400000
 #define ACPI_POWER_COMPONENT           0x00800000
 #define ACPI_CONTAINER_COMPONENT       0x01000000
-#define ACPI_PROCESSOR_COMPONENT       0x01000000
 #define ACPI_SYSTEM_COMPONENT          0x02000000
 #define ACPI_THERMAL_COMPONENT         0x04000000
 #define ACPI_MEMORY_DEVICE_COMPONENT   0x08000000
-#define ACPI_VIDEO_COMPONENT           0x08000000
+#define ACPI_VIDEO_COMPONENT           0x10000000
+#define ACPI_PROCESSOR_COMPONENT       0x20000000
 
 /*
  * _HID definitions