diff --git a/[refs] b/[refs]
index 0b087bdd1b15..4f1508f69992 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98eaa0987afdcab0929dc205edb5c492cf66a370
+refs/heads/master: b79ddf2c2dba44114d150c7758002ef29e693086
diff --git a/trunk/arch/powerpc/include/asm/qe.h b/trunk/arch/powerpc/include/asm/qe.h
index f388f0ab193f..28fee3b7887a 100644
--- a/trunk/arch/powerpc/include/asm/qe.h
+++ b/trunk/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);