From: Zhang Yanmin Change PCIEAER to depend on both PCIEPORTBUS and ACPI. Signed-off-by: Zhang Yanmin Cc: Greg KH Cc: Tom Long Nguyen Signed-off-by: Andrew Morton --- drivers/pci/pcie/aer/Kconfig | 2 +- drivers/pci/pcie/aer/Makefile | 6 ++---- drivers/pci/pcie/aer/aerdrv.h | 10 ---------- 3 files changed, 3 insertions(+), 15 deletions(-) diff -puN drivers/pci/pcie/aer/Kconfig~fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc drivers/pci/pcie/aer/Kconfig --- a/drivers/pci/pcie/aer/Kconfig~fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc +++ a/drivers/pci/pcie/aer/Kconfig @@ -4,7 +4,7 @@ config PCIEAER boolean "Root Port Advanced Error Reporting support" - depends on PCIEPORTBUS + depends on PCIEPORTBUS && ACPI default y help This enables PCI Express Root Port Advanced Error Reporting diff -puN drivers/pci/pcie/aer/Makefile~fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc drivers/pci/pcie/aer/Makefile --- a/drivers/pci/pcie/aer/Makefile~fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc +++ a/drivers/pci/pcie/aer/Makefile @@ -2,9 +2,7 @@ # Makefile for PCI-Express Root Port Advanced Error Reporting Driver # -obj-$(CONFIG_PCIEAER) += aerdriver.o -aerdrv_acpi-$(CONFIG_ACPI) += aerdrv_acpi.o +obj-$(CONFIG_PCIEAER) += aerdriver.o -aerdriver-objs := aerdrv_errprint.o aerdrv_core.o aerdrv.o -aerdriver-objs += $(aerdrv_acpi-y) +aerdriver-objs := aerdrv_errprint.o aerdrv_core.o aerdrv.o aerdrv_acpi.o diff -puN drivers/pci/pcie/aer/aerdrv.h~fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc drivers/pci/pcie/aer/aerdrv.h --- a/drivers/pci/pcie/aer/aerdrv.h~fix-gregkh-pci-pci-express-aer-implemetation-aer-core-and-aerdriver-on-powerpc +++ a/drivers/pci/pcie/aer/aerdrv.h @@ -18,11 +18,6 @@ #define AER_ERROR_MASK 0x001fffff #define AER_ERROR(d) (d & AER_ERROR_MASK) -#define VERBOSE_LIMIT_DISPLAY 1 -#define VERBOSE_FULL_DISPLAY 2 -#define VERBOSE_RAW_DISPLAY 3 -#define VERBOSE_MASK 0x3 - #define OSC_METHOD_RUN_SUCCESS 0 #define OSC_METHOD_NOT_SUPPORTED 1 #define OSC_METHOD_RUN_FAILURE 2 @@ -125,11 +120,6 @@ extern void aer_delete_rootport(struct a extern int aer_init(struct pcie_device *dev); extern void aer_isr(void *context); extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); - -#ifdef CONFIG_ACPI extern int aer_osc_setup(struct pci_dev *dev); -#else -#define aer_osc_setup(dev) (OSC_METHOD_NOT_SUPPORTED) -#endif #endif //_AERDRV_H_ _