diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-15 15:51:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-15 15:51:55 -0700 |
| commit | 7e52b33bd50faa866bc3e6e97e68438bc5e52251 (patch) | |
| tree | 46e68adf23f4f170a0eb5045c33a76234de6cf92 /drivers/acpi/scan.c | |
| parent | 91c8028c95a468da9c0aafd2d91cf24e27784206 (diff) | |
| parent | 2a0c451ade8e1783c5d453948289e4a978d417c9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv6/route.c
This deals with a merge conflict between the net-next addition of the
inetpeer network namespace ops, and Thomas Graf's bug fix in
2a0c451ade8e1783c5d453948289e4a978d417c9 which makes sure we don't
register /proc/net/ipv6_route before it is actually safe to do so.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 85cbfdccc97c..c8a1f3b68110 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1567,6 +1567,7 @@ static int acpi_bus_scan_fixed(void) ACPI_BUS_TYPE_POWER_BUTTON, ACPI_STA_DEFAULT, &ops); + device_init_wakeup(&device->dev, true); } if ((acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON) == 0) { |