diff --git a/[refs] b/[refs]
index a9f4738df597..0561fe9dcc18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d29bfb79e632fe318f4c01c9c2e8faacb89b800
+refs/heads/master: 65b3bc358a3195ebe459761a248cf33a61539947
diff --git a/trunk/include/linux/aer.h b/trunk/include/linux/aer.h
index 402e178b38eb..64aacaed8d6c 100644
--- a/trunk/include/linux/aer.h
+++ b/trunk/include/linux/aer.h
@@ -14,10 +14,10 @@ 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);
 #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)
 #endif
 
 #endif //_AER_H_