diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-08 23:03:30 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-08 23:03:30 +0100 |
| commit | 223176bc722a7bf519904180e956292ae1d1e819 (patch) | |
| tree | 75b84d09c4b6eed81e537a4e587236f05faa5b7d /drivers/acpi/sleep/poweroff.c | |
| parent | 7d333d6c739a5cd6d60102ea1a9940cbbb0546ec (diff) | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
Merge branch 'master' of /usr/src/linux-2.6
Diffstat (limited to 'drivers/acpi/sleep/poweroff.c')
| -rw-r--r-- | drivers/acpi/sleep/poweroff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c index f93d2ee5480..a5f947de879 100644 --- a/drivers/acpi/sleep/poweroff.c +++ b/drivers/acpi/sleep/poweroff.c @@ -95,4 +95,4 @@ static int acpi_poweroff_init(void) late_initcall(acpi_poweroff_init); -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM */ |