Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/cifs/export.c

1 files changed, 6 insertions, 4 deletions

diff --git a/include/linux/aer.h b/include/linux/aer.h
index 402e178b38eb..509656286e53 100644
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
@@ -13,11 +13,13 @@ extern int pci_enable_pcie_error_reporting(struct pci_dev *dev);
 extern int pci_find_aer_capability(struct pci_dev *dev);
 extern int pci_disable_pcie_error_reporting(struct pci_dev *dev);
 extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
+extern int pci_cleanup_aer_correct_error_status(struct pci_dev *dev);
 #else
-#define pci_enable_pcie_error_reporting(dev)            do { } while (0)
-#define pci_find_aer_capability(dev)                    do { } while (0)
-#define pci_disable_pcie_error_reporting(dev)           do { } while (0)
-#define pci_cleanup_aer_uncorrect_error_status(dev)     do { } while (0)
+#define pci_enable_pcie_error_reporting(dev)            (-EINVAL)
+#define pci_find_aer_capability(dev)                    (0)
+#define pci_disable_pcie_error_reporting(dev)           (-EINVAL)
+#define pci_cleanup_aer_uncorrect_error_status(dev)     (-EINVAL)
+#define pci_cleanup_aer_correct_error_status(dev)       (-EINVAL)
 #endif
 
 #endif //_AER_H_