openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/acpi/acpica
History
Len Brown d326f44e5f Merge branch 'tboot' into release 
Conflicts:
	drivers/acpi/acpica/hwsleep.c

Text conflict between:

2feec47d4c
(ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers)

which removed #include "actables.h"

and

09f98a825a
(x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.)

which removed #include <linux/tboot.h>

The resolution is to remove them both.

Signed-off-by: Len Brown <len.brown@intel.com>
 		2012-03-30 16:38:59 -04:00
..
Makefile ACPICA: Split sleep/wake functions into two files 2012-03-22 01:45:03 -04:00
accommon.h ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
acdebug.h ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
acdispat.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
acevents.h ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
acglobal.h ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
achware.h ACPICA: Sleep/Wake interfaces: optionally execute _GTS and _BFS 2012-03-26 21:16:25 -04:00
acinterp.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
aclocal.h ACPICA: Object repair code: Support to add Package wrappers 2012-03-30 01:45:13 -04:00
acmacros.h ACPICA: Add table-driven dispatch for sleep/wake functions 2012-03-22 01:45:05 -04:00
acnamesp.h ACPICA: Object repair code: Support to add Package wrappers 2012-03-30 01:45:13 -04:00
acobject.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
acopcode.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
acparser.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
acpredef.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
acresrc.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
acstruct.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
actables.h ACPICA: Add acpi_os_physical_table_override interface 2012-03-22 01:44:59 -04:00
acutils.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
amlcode.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
amlresrc.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dsargs.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dscontrol.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dsfield.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dsinit.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dsmethod.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dsmthdat.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dsobject.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dsopcode.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dsutils.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dswexec.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dswload.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dswload2.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dswscope.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
dswstate.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
evevent.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evglock.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evgpe.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evgpeblk.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evgpeinit.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evgpeutil.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evmisc.c ACPICA: ACPI 5: Update debug output for new notify values 2012-03-22 01:44:57 -04:00
evregion.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
evrgnini.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
evsci.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evxface.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evxfevnt.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evxfgpe.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evxfregn.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exconfig.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exconvrt.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
excreate.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exdebug.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exdump.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exfield.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exfldio.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exmisc.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exmutex.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exnames.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exoparg1.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exoparg2.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exoparg3.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exoparg6.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exprep.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exregion.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exresnte.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exresolv.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exresop.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exstore.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exstoren.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exstorob.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exsystem.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exutils.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
hwacpi.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
hwesleep.c ACPI: Move module parameter gts and bfs to sleep.c 2012-03-26 21:16:26 -04:00
hwgpe.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
hwpci.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
hwregs.c ACPICA: Expand OSL memory read/write interfaces to 64 bits 2012-03-22 01:44:54 -04:00
hwsleep.c Merge branch 'tboot' into release 2012-03-30 16:38:59 -04:00
hwtimer.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
hwvalid.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
hwxface.c Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'red-hat-bz-727865', 'thermal', 'throttling', 'turbostat' and 'video' into release 2012-03-30 16:10:37 -04:00
hwxfsleep.c ACPICA: Sleep/Wake interfaces: optionally execute _GTS and _BFS 2012-03-26 21:16:25 -04:00
nsaccess.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsalloc.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsdump.c ACPICA: Debugger: Add missing object info to namespace dump 2012-03-22 01:46:04 -04:00
nsdumpdv.c ACPICA: Clarify METHOD_NAME* defines for full-pathname cases 2012-03-22 01:45:53 -04:00
nseval.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsinit.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsload.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsnames.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsobject.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsparse.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nspredef.c ACPICA: Object repair code: Support to add Package wrappers 2012-03-30 01:45:13 -04:00
nsrepair.c ACPICA: Object repair code: Support to add Package wrappers 2012-03-30 01:45:13 -04:00
nsrepair2.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nssearch.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsutils.c ACPICA: Change exception code for invalid pathname in acpi_evaluate_object 2012-03-22 01:45:57 -04:00
nswalk.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsxfeval.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsxfname.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nsxfobj.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
psargs.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
psloop.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
psopcode.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
psparse.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
psscope.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
pstree.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
psutils.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
pswalk.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
psxface.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsaddr.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rscalc.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rscreate.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsdump.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsinfo.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsio.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsirq.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rslist.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsmemory.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsmisc.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsserial.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsutils.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsxface.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
tbfadt.c ACPICA: Fix regression in FADT revision checks 2012-03-21 00:47:11 -04:00
tbfind.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
tbinstal.c ACPICA: Add acpi_os_physical_table_override interface 2012-03-22 01:44:59 -04:00
tbutils.c ACPICA: Add acpi_os_physical_table_override interface 2012-03-22 01:44:59 -04:00
tbxface.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
tbxfroot.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utaddress.c ACPICA: Add support for region address conflict checking 2012-01-17 03:38:50 -05:00
utalloc.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utcopy.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utdebug.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utdecode.c ACPICA: ACPI 5: Update debug output for new notify values 2012-03-22 01:44:57 -04:00
utdelete.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
uteval.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utglobal.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
utids.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utinit.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
utlock.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utmath.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utmisc.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utmutex.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utobject.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utosi.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utresrc.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utstate.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utxface.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
utxferror.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
utxfmutex.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00