1 files changed, 133 insertions, 24 deletions
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index b0af3b83eda8..5f7d0cd11002 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -8,41 +8,150 @@ ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT
 # use acpi.o to put all files here into acpi.o modparam namespace
 obj-y   += acpi.o
-acpi-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
+acpi-y :=               \
-         dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \
+        dsargs.o        \
-         dsinit.o dsargs.o dscontrol.o dswload2.o
+        dscontrol.o     \
+        dsfield.o       \
+        dsinit.o        \
+        dsmethod.o      \
+        dsmthdat.o      \
+        dsobject.o      \
+        dsopcode.o      \
+        dsutils.o       \
+        dswexec.o       \
+        dswload.o       \
+        dswload2.o      \
+        dswscope.o      \
+        dswstate.o
-acpi-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \
+acpi-y +=               \
-         evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
+        evevent.o       \
-         evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o evxfgpe.o evglock.o
+        evgpe.o         \
+        evgpeblk.o      \
+        evgpeinit.o     \
+        evgpeutil.o     \
+        evglock.o       \
+        evmisc.o        \
+        evregion.o      \
+        evrgnini.o      \
+        evsci.o         \
+        evxface.o       \
+        evxfevnt.o      \
+        evxfgpe.o       \
+        evxfregn.o
-acpi-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\
+acpi-y +=               \
-         exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\
+        exconfig.o      \
-         excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \
+        exconvrt.o      \
-         exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o  exdebug.o
+        excreate.o      \
+        exdebug.o       \
+        exdump.o        \
+        exfield.o       \
+        exfldio.o       \
+        exmutex.o       \
+        exnames.o       \
+        exoparg1.o      \
+        exoparg2.o      \
+        exoparg3.o      \
+        exoparg6.o      \
+        exprep.o        \
+        exmisc.o        \
+        exregion.o      \
+        exresnte.o      \
+        exresolv.o      \
+        exresop.o       \
+        exstore.o       \
+        exstoren.o      \
+        exstorob.o      \
+        exsystem.o      \
+        exutils.o
-acpi-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o hwvalid.o hwpci.o
+acpi-y +=               \
+        hwacpi.o        \
+        hwgpe.o         \
+        hwpci.o         \
+        hwregs.o        \
+        hwsleep.o       \
+        hwvalid.o       \
+        hwxface.o
 acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
-acpi-y += nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \
+acpi-y +=               \
-         nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \
+        nsaccess.o      \
-         nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \
+        nsalloc.o       \
-         nsparse.o   nspredef.o  nsrepair.o  nsrepair2.o
+        nsdump.o        \
+        nseval.o        \
+        nsinit.o        \
+        nsload.o        \
+        nsnames.o       \
+        nsobject.o      \
+        nsparse.o       \
+        nspredef.o      \
+        nsrepair.o      \
+        nsrepair2.o     \
+        nssearch.o      \
+        nsutils.o       \
+        nswalk.o        \
+        nsxfeval.o      \
+        nsxfname.o      \
+        nsxfobj.o
 acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
-acpi-y += psargs.o    psparse.o  psloop.o pstree.o   pswalk.o  \
+acpi-y +=               \
-         psopcode.o  psscope.o  psutils.o  psxface.o
+        psargs.o        \
+        psloop.o        \
+        psopcode.o      \
+        psparse.o       \
+        psscope.o       \
+        pstree.o        \
+        psutils.o       \
+        pswalk.o        \
+        psxface.o
-acpi-y += rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \
+acpi-y +=               \
-         rscalc.o  rsirq.o  rsmemory.o  rsutils.o rsserial.o
+        rsaddr.o        \
+        rscalc.o        \
+        rscreate.o      \
+        rsinfo.o        \
+        rsio.o          \
+        rsirq.o         \
+        rslist.o        \
+        rsmemory.o      \
+        rsmisc.o        \
+        rsserial.o      \
+        rsutils.o       \
+        rsxface.o
 acpi-$(ACPI_FUTURE_USAGE) += rsdump.o
-acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o
+acpi-y +=               \
+        tbfadt.o        \
+        tbfind.o        \
+        tbinstal.o      \
+        tbutils.o       \
+        tbxface.o       \
+        tbxfroot.o
-acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
+acpi-y +=               \
-                utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
+        utalloc.o       \
-                utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \
+        utcopy.o        \
-                utosi.o utxferror.o utdecode.o utxfmutex.o
+        utdebug.o       \
+        utdecode.o      \
+        utdelete.o      \
+        uteval.o        \
+        utglobal.o      \
+        utids.o         \
+        utinit.o        \
+        utlock.o        \
+        utmath.o        \
+        utmisc.o        \
+        utmutex.o       \
+        utobject.o      \
+        utosi.o         \
+        utresrc.o       \
+        utstate.o       \
+        utxface.o       \
+        utxferror.o     \
+        utxfmutex.o

diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile index b0af3b83eda8..5f7d0cd11002 100644 --- a/drivers/acpi/acpica/Makefile +++ b/drivers/acpi/acpica/Makefile
@@ -8,41 +8,150 @@ ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT
8	# use acpi.o to put all files here into acpi.o modparam namespace	8	# use acpi.o to put all files here into acpi.o modparam namespace
9	obj-y += acpi.o	9	obj-y += acpi.o
10		10
11	acpi-y := dsfield.o dsmthdat.o dsopcode.o dswexec.o dswscope.o \	11	acpi-y := \
12	dsmethod.o dsobject.o dsutils.o dswload.o dswstate.o \	12	dsargs.o \
13	dsinit.o dsargs.o dscontrol.o dswload2.o	13	dscontrol.o \
		14	dsfield.o \
		15	dsinit.o \
		16	dsmethod.o \
		17	dsmthdat.o \
		18	dsobject.o \
		19	dsopcode.o \
		20	dsutils.o \
		21	dswexec.o \
		22	dswload.o \
		23	dswload2.o \
		24	dswscope.o \
		25	dswstate.o
14		26
15	acpi-y += evevent.o evregion.o evsci.o evxfevnt.o \	27	acpi-y += \
16	evmisc.o evrgnini.o evxface.o evxfregn.o \	28	evevent.o \
17	evgpe.o evgpeblk.o evgpeinit.o evgpeutil.o evxfgpe.o evglock.o	29	evgpe.o \
		30	evgpeblk.o \
		31	evgpeinit.o \
		32	evgpeutil.o \
		33	evglock.o \
		34	evmisc.o \
		35	evregion.o \
		36	evrgnini.o \
		37	evsci.o \
		38	evxface.o \
		39	evxfevnt.o \
		40	evxfgpe.o \
		41	evxfregn.o
18		42
19	acpi-y += exconfig.o exfield.o exnames.o exoparg6.o exresolv.o exstorob.o\	43	acpi-y += \
20	exconvrt.o exfldio.o exoparg1.o exprep.o exresop.o exsystem.o\	44	exconfig.o \
21	excreate.o exmisc.o exoparg2.o exregion.o exstore.o exutils.o \	45	exconvrt.o \
22	exdump.o exmutex.o exoparg3.o exresnte.o exstoren.o exdebug.o	46	excreate.o \
		47	exdebug.o \
		48	exdump.o \
		49	exfield.o \
		50	exfldio.o \
		51	exmutex.o \
		52	exnames.o \
		53	exoparg1.o \
		54	exoparg2.o \
		55	exoparg3.o \
		56	exoparg6.o \
		57	exprep.o \
		58	exmisc.o \
		59	exregion.o \
		60	exresnte.o \
		61	exresolv.o \
		62	exresop.o \
		63	exstore.o \
		64	exstoren.o \
		65	exstorob.o \
		66	exsystem.o \
		67	exutils.o
23		68
24	acpi-y += hwacpi.o hwgpe.o hwregs.o hwsleep.o hwxface.o hwvalid.o hwpci.o	69	acpi-y += \
		70	hwacpi.o \
		71	hwgpe.o \
		72	hwpci.o \
		73	hwregs.o \
		74	hwsleep.o \
		75	hwvalid.o \
		76	hwxface.o
25		77
26	acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o	78	acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
27		79
28	acpi-y += nsaccess.o nsload.o nssearch.o nsxfeval.o \	80	acpi-y += \
29	nsalloc.o nseval.o nsnames.o nsutils.o nsxfname.o \	81	nsaccess.o \
30	nsdump.o nsinit.o nsobject.o nswalk.o nsxfobj.o \	82	nsalloc.o \
31	nsparse.o nspredef.o nsrepair.o nsrepair2.o	83	nsdump.o \
		84	nseval.o \
		85	nsinit.o \
		86	nsload.o \
		87	nsnames.o \
		88	nsobject.o \
		89	nsparse.o \
		90	nspredef.o \
		91	nsrepair.o \
		92	nsrepair2.o \
		93	nssearch.o \
		94	nsutils.o \
		95	nswalk.o \
		96	nsxfeval.o \
		97	nsxfname.o \
		98	nsxfobj.o
32		99
33	acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o	100	acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
34		101
35	acpi-y += psargs.o psparse.o psloop.o pstree.o pswalk.o \	102	acpi-y += \
36	psopcode.o psscope.o psutils.o psxface.o	103	psargs.o \
		104	psloop.o \
		105	psopcode.o \
		106	psparse.o \
		107	psscope.o \
		108	pstree.o \
		109	psutils.o \
		110	pswalk.o \
		111	psxface.o
37		112
38	acpi-y += rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \	113	acpi-y += \
39	rscalc.o rsirq.o rsmemory.o rsutils.o rsserial.o	114	rsaddr.o \
		115	rscalc.o \
		116	rscreate.o \
		117	rsinfo.o \
		118	rsio.o \
		119	rsirq.o \
		120	rslist.o \
		121	rsmemory.o \
		122	rsmisc.o \
		123	rsserial.o \
		124	rsutils.o \
		125	rsxface.o
40		126
41	acpi-$(ACPI_FUTURE_USAGE) += rsdump.o	127	acpi-$(ACPI_FUTURE_USAGE) += rsdump.o
42		128
43	acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o	129	acpi-y += \
		130	tbfadt.o \
		131	tbfind.o \
		132	tbinstal.o \
		133	tbutils.o \
		134	tbxface.o \
		135	tbxfroot.o
44		136
45	acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \	137	acpi-y += \
46	utcopy.o utdelete.o utglobal.o utmath.o utobject.o \	138	utalloc.o \
47	utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \	139	utcopy.o \
48	utosi.o utxferror.o utdecode.o utxfmutex.o	140	utdebug.o \
		141	utdecode.o \
		142	utdelete.o \
		143	uteval.o \
		144	utglobal.o \
		145	utids.o \
		146	utinit.o \
		147	utlock.o \
		148	utmath.o \
		149	utmisc.o \
		150	utmutex.o \
		151	utobject.o \
		152	utosi.o \
		153	utresrc.o \
		154	utstate.o \
		155	utxface.o \
		156	utxferror.o \
		157	utxfmutex.o