tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Bjorn Helgaas
and committed by
Len Brown
44342f9e
89595b8f
+3
-3
+3
-3
include/acpi/acpi_drivers.h
+3
-3
include/acpi/acpi_drivers.h
···
35
35
#define ACPI_AC_COMPONENT 0x00020000
36
36
#define ACPI_BATTERY_COMPONENT 0x00040000
37
37
#define ACPI_BUTTON_COMPONENT 0x00080000
38
-
#define ACPI_SBS_COMPONENT 0x00080000
38
+
#define ACPI_SBS_COMPONENT 0x00100000
39
39
#define ACPI_FAN_COMPONENT 0x00200000
40
40
#define ACPI_PCI_COMPONENT 0x00400000
41
41
#define ACPI_POWER_COMPONENT 0x00800000
42
42
#define ACPI_CONTAINER_COMPONENT 0x01000000
43
-
#define ACPI_PROCESSOR_COMPONENT 0x01000000
44
43
#define ACPI_SYSTEM_COMPONENT 0x02000000
45
44
#define ACPI_THERMAL_COMPONENT 0x04000000
46
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
50
* _HID definitions