summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pcie/aer/Makefile
diff options
context:
space:
mode:
authorZhang, Yanmin <yanmin_zhang@linux.intel.com>2007-06-06 11:44:16 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2007-07-11 16:02:08 -0700
commit8d29bfb79e632fe318f4c01c9c2e8faacb89b800 (patch)
tree696caa373f8340153bd18655ed4f61b035823f16 /drivers/pci/pcie/aer/Makefile
parentf477836457730a2b925f625023ec4e5bf11015be (diff)
downloadlinux-8d29bfb79e632fe318f4c01c9c2e8faacb89b800.tar.gz
linux-8d29bfb79e632fe318f4c01c9c2e8faacb89b800.tar.bz2
linux-8d29bfb79e632fe318f4c01c9c2e8faacb89b800.zip
PCI: fix AER driver error information
Below patch fixes aer driver error information and enables aer driver although CONFIG_ACPI=n. As a matter of fact, the new patch is created from below 2 patches plus a minor patch apply fuzz fixing. Because the second patch fixed a compilation error introduced by the first patch, I merge them to facilitate bisect. 1) http://marc.info/?l=linux-kernel&m=117783233918191&w=2; 2) http://marc.info/?l=linux-mm-commits&m=118046936720790&w=2 Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com> Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/pcie/aer/Makefile')
-rw-r--r--drivers/pci/pcie/aer/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/pcie/aer/Makefile b/drivers/pci/pcie/aer/Makefile
index 15a4f40d520b..8da3bd8455a8 100644
--- a/drivers/pci/pcie/aer/Makefile
+++ b/drivers/pci/pcie/aer/Makefile
@@ -4,5 +4,6 @@
obj-$(CONFIG_PCIEAER) += aerdriver.o
-aerdriver-objs := aerdrv_errprint.o aerdrv_core.o aerdrv.o aerdrv_acpi.o
+aerdriver-objs := aerdrv_errprint.o aerdrv_core.o aerdrv.o
+aerdriver-$(CONFIG_ACPI) += aerdrv_acpi.o