diff --git a/kernel/Makefile b/kernel/Makefile
index e7d69821..89ac1300 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -372,6 +372,8 @@ KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
 		   -fno-strict-aliasing -fno-common \
 		   -Werror-implicit-function-declaration \
 		   -Wno-format-security \
+		   -Wno-maybe-uninitialized \
+		   -Wno-uninitialized \
 		   -fno-delete-null-pointer-checks
 KBUILD_AFLAGS_KERNEL :=
 KBUILD_CFLAGS_KERNEL :=
@@ -645,7 +647,6 @@ ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)
 endif
 
 #Gionee lingfen 2012-12-4 merge gionee start
--include $(PWD)/../$(GN_KCONFIG_TMP_FILE)
 KBUILD_CFLAGS += $(GN_CFLAGS)
 #Gionee lingfen 2012-12-4 merge gionee end
 # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments