commit d464979968dee6e258ee04d3ec9b28edaf769e7f
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 11 21:51:55 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 11 21:51:55 2017 -0700
tree 6af28d935ba071184b052130a6537e7e0db9d940
parent 5451c45d6fe51c111af4065dd199616756d7b48e
parent 33e1d9227afc469efce5c63ea2ac5bd875553afa

Merge "[qca-ssdk]: fix shell review comments"

config

diff --git a/config b/config
index d4a9503..e8732fd 100755
--- a/config
+++ b/config
@@ -101,7 +101,7 @@
 endif
 
 ifeq ($(KVER),$(filter 4.4%,$(KVER)))
-  CPU_CFLAG= -DMODULE -nostdinc -D$(BOARD_NAME) -mlittle-endian -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Wno-format-security -fno-delete-null-pointer-checks -O2 -fno-dwarf2-cfi-asm -mabi=aapcs-linux -mno-thumb-interwork -mfpu=vfp -funwind-tables -marm -D__LINUX_ARM_ARCH__=7 -march=armv7-a -msoft-float -Uarm -Wframe-larger-than=1024 -fno-stack-protector -Wno-unused-but-set-variable -fomit-frame-pointer -g -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack -Werror=implicit-int -DCC_HAVE_ASM_GOTO    -D"KBUILD_STR(s)=\#s" -D"KBUILD_BASENAME=KBUILD_STR(mem)"  -D"KBUILD_MODNAME=KBUILD_STR(mem)"
+  CPU_CFLAG= -DMODULE -nostdinc -D$(BOARD_NAME) -mlittle-endian -Wundef -Wstrict-prototypes -Wno-trigraphs -Werror -fno-strict-aliasing -fno-common -Wno-format-security -fno-delete-null-pointer-checks -O2 -fno-dwarf2-cfi-asm -mabi=aapcs-linux -mno-thumb-interwork -mfpu=vfp -funwind-tables -marm -D__LINUX_ARM_ARCH__=7 -march=armv7-a -msoft-float -Uarm -Wframe-larger-than=1024 -fno-stack-protector -Wno-unused-but-set-variable -fomit-frame-pointer -g -Wdeclaration-after-statement -Wno-pointer-sign -fno-strict-overflow -fconserve-stack -Werror=implicit-int -DCC_HAVE_ASM_GOTO    -D"KBUILD_STR(s)=\#s" -D"KBUILD_BASENAME=KBUILD_STR(mem)"
 endif
 
 ifeq ($(KVER),$(filter 3.18%,$(KVER)))

src/init/ssdk_init.c

diff --git a/src/init/ssdk_init.c b/src/init/ssdk_init.c
index bf1a980..60235dd 100755
--- a/src/init/ssdk_init.c
+++ b/src/init/ssdk_init.c
@@ -48,6 +48,7 @@
 #if defined(CONFIG_OF) && (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
 #include <linux/switch.h>
 #include <linux/of.h>
+#include <linux/reset.h>
 #ifdef BOARD_AR71XX
 #ifdef CONFIG_AR8216_PHY
 #include "drivers/net/phy/ar8327.h"

src/init/ssdk_plat.c

diff --git a/src/init/ssdk_plat.c b/src/init/ssdk_plat.c
index a71c56c..a83e8ae 100755
--- a/src/init/ssdk_plat.c
+++ b/src/init/ssdk_plat.c
@@ -47,6 +47,7 @@
 #if defined(CONFIG_OF) && (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0))
 #include <linux/switch.h>
 #include <linux/of.h>
+#include <linux/of_platform.h>
 #elif defined(CONFIG_OF) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
 #include <linux/switch.h>
 #include <linux/of.h>