aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-11-07 18:57:50 -0500
committerLen Brown <len.brown@intel.com>2008-11-07 21:44:49 -0500
commit44342f9e8dfbe8c0fadf940bf6b5c2eaaffe6850 (patch)
treeff8152f1a1229272fe6faff0b59b1080d5c2743f
parent89595b8f2850a080d290bf778ec933ea1d99f78e (diff)
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>
-rw-r--r--include/acpi/acpi_drivers.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 8778a3a00bc..414a6ccdc04 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -35,16 +35,16 @@
35#define ACPI_AC_COMPONENT 0x00020000 35#define ACPI_AC_COMPONENT 0x00020000
36#define ACPI_BATTERY_COMPONENT 0x00040000 36#define ACPI_BATTERY_COMPONENT 0x00040000
37#define ACPI_BUTTON_COMPONENT 0x00080000 37#define ACPI_BUTTON_COMPONENT 0x00080000
38#define ACPI_SBS_COMPONENT 0x00080000 38#define ACPI_SBS_COMPONENT 0x00100000
39#define ACPI_FAN_COMPONENT 0x00200000 39#define ACPI_FAN_COMPONENT 0x00200000
40#define ACPI_PCI_COMPONENT 0x00400000 40#define ACPI_PCI_COMPONENT 0x00400000
41#define ACPI_POWER_COMPONENT 0x00800000 41#define ACPI_POWER_COMPONENT 0x00800000
42#define ACPI_CONTAINER_COMPONENT 0x01000000 42#define ACPI_CONTAINER_COMPONENT 0x01000000
43#define ACPI_PROCESSOR_COMPONENT 0x01000000
44#define ACPI_SYSTEM_COMPONENT 0x02000000 43#define ACPI_SYSTEM_COMPONENT 0x02000000
45#define ACPI_THERMAL_COMPONENT 0x04000000 44#define ACPI_THERMAL_COMPONENT 0x04000000
46#define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000 45#define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000
47#define ACPI_VIDEO_COMPONENT 0x08000000 46#define ACPI_VIDEO_COMPONENT 0x10000000
47#define ACPI_PROCESSOR_COMPONENT 0x20000000
48 48
49/* 49/*
50 * _HID definitions 50 * _HID definitions