From b131c9dcf03e7192b9ce96af695c567c7709afbb Mon Sep 17 00:00:00 2001 From: Chen Gong Date: Fri, 20 May 2011 13:36:01 +0800 Subject: [PATCH] --- yaml --- r: 250100 b: refs/heads/master c: cbfddd20937ed890ce7027fa08a7c84e977128cf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/pcie/aer/aerdrv.h | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index cc27d4d1415b..3f4cc81b12b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc2c2c9dd513dec6c17df04e8abff795e20a5271 +refs/heads/master: cbfddd20937ed890ce7027fa08a7c84e977128cf diff --git a/trunk/drivers/pci/pcie/aer/aerdrv.h b/trunk/drivers/pci/pcie/aer/aerdrv.h index 3eb77080366a..94a7598eb262 100644 --- a/trunk/drivers/pci/pcie/aer/aerdrv.h +++ b/trunk/drivers/pci/pcie/aer/aerdrv.h @@ -114,15 +114,6 @@ extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); extern void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info); extern irqreturn_t aer_irq(int irq, void *context); -#ifdef CONFIG_ACPI -extern int aer_osc_setup(struct pcie_device *pciedev); -#else -static inline int aer_osc_setup(struct pcie_device *pciedev) -{ - return 0; -} -#endif - #ifdef CONFIG_ACPI_APEI extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev); #else