From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Thu, 27 Aug 2009 17:30:19 +0000 (+0400)
Subject: powerpc/qe: Add qe_upload_firmware() stub for non-QE builds
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b79ddf2c2dba44114d150c7758002ef29e693086;p=deliverable%2Flinux.git

powerpc/qe: Add qe_upload_firmware() stub for non-QE builds

This is needed to avoid #ifdefs in MPC85xx suspend/resume code.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

diff --git a/arch/powerpc/include/asm/qe.h b/arch/powerpc/include/asm/qe.h
index f388f0ab193f..28fee3b7887a 100644
--- a/arch/powerpc/include/asm/qe.h
+++ b/arch/powerpc/include/asm/qe.h
@@ -210,8 +210,15 @@ struct qe_firmware_info {
 	u64 extended_modes;	/* Extended modes */
 };
 
+#ifdef CONFIG_QUICC_ENGINE
 /* Upload a firmware to the QE */
 int qe_upload_firmware(const struct qe_firmware *firmware);
+#else
+static inline int qe_upload_firmware(const struct qe_firmware *firmware)
+{
+	return -ENOSYS;
+}
+#endif /* CONFIG_QUICC_ENGINE */
 
 /* Obtain information on the uploaded firmware */
 struct qe_firmware_info *qe_get_firmware_info(void);