From 0effc6b7f935b36cd380a191073bd08f06d43d5e Mon Sep 17 00:00:00 2001 From: Ajay Kishore Date: Wed, 12 Oct 2016 13:02:40 +0530 Subject: [PATCH] ipq806x: Fixed compilation warning Change-Id: Ifbabe06bdad546d70018448253cb7df107f9001a Signed-off-by: Ajay Kishore --- include/configs/ipq806x.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/include/configs/ipq806x.h b/include/configs/ipq806x.h index 34d5d8948b..e9097247ba 100644 --- a/include/configs/ipq806x.h +++ b/include/configs/ipq806x.h @@ -156,9 +156,7 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #endif -<<<<<<< HEAD #define QCA_ROOT_FS_PART_NAME "rootfs" -======= /* * CRASH DUMP ENABLE */ @@ -170,13 +168,10 @@ #undef CONFIG_NET_RETRY_COUNT #define CONFIG_NET_RETRY_COUNT 500 #endif ->>>>>>> 26ff960... ipq806x : Enable crashdump support #ifndef __ASSEMBLY__ #include -<<<<<<< HEAD -======= /* * XXX XXX Please do not instantiate this structure. XXX XXX * This is just a convenience to avoid @@ -200,7 +195,7 @@ typedef struct { uint8_t nss[16 * 1024 * 1024]; uint8_t smem[2 * 1024 * 1024]; -#ifdef CONFIG_IPQ_APPSBL_DLOAD +#ifdef CONFIG_QCA_APPSBL_DLOAD uint8_t uboot[1 * 1024 * 1024]; uint8_t nsstcmdump[128 * 1024]; uint8_t sbl3[384 * 1024]; @@ -221,7 +216,6 @@ typedef struct { #define IPQ_TEMP_DUMP_ADDR (IPQ_MEM_RESERVE_BASE(nsstcmdump)) #define CONFIG_QCA_SMEM_BASE CONFIG_SYS_SDRAM_BASE + 0x1000000 ->>>>>>> 26ff960... ipq806x : Enable crashdump support #endif /* __ASSEMBLY__ */ #ifndef CONFIG_FIT