diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 08:37:13 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 08:37:13 +0400 |
| commit | 003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch) | |
| tree | c9b941f4798a2accca200b0b01c07353ce5b07e1 /drivers/acpi/internal.h | |
| parent | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff) | |
| parent | e55a5999ffcf72dc4d43d73618957964cb87065a (diff) | |
| download | linux-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.tar.xz | |
Merge branch 'sfi-base' into release
Conflicts:
drivers/acpi/power.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 11a69b53004e..074cf8682d52 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -1,4 +1,24 @@ -/* For use by Linux/ACPI infrastructure, not drivers */ +/* + * acpi/internal.h + * For use by Linux/ACPI infrastructure, not drivers + * + * Copyright (c) 2009, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#define PREFIX "ACPI: " int init_acpi_device_notify(void); int acpi_scan_init(void); |