Merge branch 'u-boot/master' into 'u-boot-arm/master'

[u-boot] / drivers / qe / qe.c

diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 9c5fbd1d69474024c3758d9dffa0405ae2370444..4358a91adb5300911753416852654b63a1cc6faf 100644 (file)
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -11,7 +11,7 @@
 #include <command.h>
 #include "asm/errno.h"
 #include "asm/io.h"
-#include "asm/immap_qe.h"
+#include "linux/immap_qe.h"
 #include "qe.h"
 
 #define MPC85xx_DEVDISR_QE_DISABLE     0x1
@@ -333,7 +333,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
        /* Check the magic */
        if ((hdr->magic[0] != 'Q') || (hdr->magic[1] != 'E') ||
            (hdr->magic[2] != 'F')) {
-               printf("Not a microcode\n");
+               printf("QE microcode not found\n");
 #ifdef CONFIG_DEEP_SLEEP
                setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_QE_DISABLE);
 #endif