summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/apei/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2010-05-28 23:42:18 +0200
committerLinus Torvalds2010-05-28 23:42:18 +0200
commit9a90e09854a3c7cc603ab8fc9163f77bb1f66cfa (patch)
treec8c5f767dd2351c9db440f003cc14401583bafd3 /drivers/acpi/apei/Makefile
parentMerge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds (diff)
parentMerge branch 'ht-delete-2.6.35' into release (diff)
downloadkernel-qcow2-linux-9a90e09854a3c7cc603ab8fc9163f77bb1f66cfa.tar.gz
kernel-qcow2-linux-9a90e09854a3c7cc603ab8fc9163f77bb1f66cfa.tar.xz
kernel-qcow2-linux-9a90e09854a3c7cc603ab8fc9163f77bb1f66cfa.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits) ACPI: Don't let acpi_pad needlessly mark TSC unstable drivers/acpi/sleep.h: Checkpatch cleanup ACPI: Minor cleanup eliminating redundant PMTIMER_TICKS to NS conversion ACPI: delete unused c-state promotion/demotion data strucutures ACPI: video: fix acpi_backlight=video ACPI: EC: Use kmemdup drivers/acpi: use kasprintf ACPI, APEI, EINJ injection parameters support Add x64 support to debugfs ACPI, APEI, Use ERST for persistent storage of MCE ACPI, APEI, Error Record Serialization Table (ERST) support ACPI, APEI, Generic Hardware Error Source memory error support ACPI, APEI, UEFI Common Platform Error Record (CPER) header Unified UUID/GUID definition ACPI Hardware Error Device (PNP0C33) support ACPI, APEI, PCIE AER, use general HEST table parsing in AER firmware_first setup ACPI, APEI, Document for APEI ACPI, APEI, EINJ support ACPI, APEI, HEST table parsing ACPI, APEI, APEI supporting infrastructure ...
Diffstat (limited to 'drivers/acpi/apei/Makefile')
-rw-r--r--drivers/acpi/apei/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/apei/Makefile b/drivers/acpi/apei/Makefile
new file mode 100644
index 000000000000..b13b03a17789
--- /dev/null
+++ b/drivers/acpi/apei/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_ACPI_APEI) += apei.o
+obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o
+obj-$(CONFIG_ACPI_APEI_EINJ) += einj.o
+
+apei-y := apei-base.o hest.o cper.o erst.o