Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 350982
b: refs/heads/master
c: 64fd740
h: refs/heads/master
v: v3
  • Loading branch information
Toshi Kani authored and Rafael J. Wysocki committed Feb 13, 2013
1 parent bd88c41 commit ce3f65b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0aa120a0138398d6597350f4c1dcb46d14be1a0b
refs/heads/master: 64fd7401c5e4cf7c64452ecd9b700a55a5ebea50
3 changes: 1 addition & 2 deletions trunk/include/linux/acpi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
#if defined(CONFIG_ACPI_HOTPLUG_CPU) && \
(defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \
(defined(CONFIG_ACPI_CONTAINER) || \
defined(CONFIG_ACPI_CONTAINER_MODULE))
defined(CONFIG_ACPI_CONTAINER)
#define ACPI_HOTPLUG_OST
#endif

Expand Down

0 comments on commit ce3f65b

Please sign in to comment.