Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

EDAC, pci_sysfs: remove unneccessary ifdef around entire file

The file edac_pci_sysfs.c is dependent on CONFIG_PCI. This is already
modelled in the Makefile, but edac_pci_sysfs.o is still contained in
the list of files compiled even without CONFIG_PCI.

This change removes edac_pci_sysfs.o from the list of built objects
when not having CONFIG_PCI enabled and removes the then-unnecessary
ifdef from the source file.

Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Link: http://lkml.kernel.org/r/1407697803-3837-1-git-send-email-rupran@einserver.de
Signed-off-by: Borislav Petkov <bp@suse.de>

authored by

Andreas Ruprecht and committed by
Borislav Petkov
19ca5a3c 665aa8cd

+1 -6
+1 -1
drivers/edac/Makefile
··· 9 9 obj-$(CONFIG_EDAC) := edac_stub.o 10 10 obj-$(CONFIG_EDAC_MM_EDAC) += edac_core.o 11 11 12 - edac_core-y := edac_mc.o edac_device.o edac_mc_sysfs.o edac_pci_sysfs.o 12 + edac_core-y := edac_mc.o edac_device.o edac_mc_sysfs.o 13 13 edac_core-y += edac_module.o edac_device_sysfs.o 14 14 15 15 ifdef CONFIG_PCI
-5
drivers/edac/edac_pci_sysfs.c
··· 14 14 #include "edac_core.h" 15 15 #include "edac_module.h" 16 16 17 - /* Turn off this whole feature if PCI is not configured */ 18 - #ifdef CONFIG_PCI 19 - 20 17 #define EDAC_PCI_SYMLINK "device" 21 18 22 19 /* data variables exported via sysfs */ ··· 758 761 module_param(edac_pci_panic_on_pe, int, 0644); 759 762 MODULE_PARM_DESC(edac_pci_panic_on_pe, 760 763 "Panic on PCI Bus Parity error: 0=off 1=on"); 761 - 762 - #endif /* CONFIG_PCI */