summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2009-07-18 03:13:38 +0000
committerSteve French <sfrench@us.ibm.com>2009-07-18 03:13:38 +0000
commit287638b2c533165c3c03dfa15196c2ba583cd287 (patch)
treee753dd2cd7421a26e179c43d7f6d4d39541a4afb /Makefile
parentf6c43385435640e056424034caac0d765c45e370 (diff)
parenta1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232 (diff)
downloadop-kernel-dev-287638b2c533165c3c03dfa15196c2ba583cd287.zip
op-kernel-dev-287638b2c533165c3c03dfa15196c2ba583cd287.tar.gz
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index be0abac..79957b3 100644
--- a/Makefile
+++ b/Makefile
@@ -343,7 +343,8 @@ KBUILD_CPPFLAGS := -D__KERNEL__
KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-fno-strict-aliasing -fno-common \
-Werror-implicit-function-declaration \
- -Wno-format-security
+ -Wno-format-security \
+ -fno-delete-null-pointer-checks
KBUILD_AFLAGS := -D__ASSEMBLY__
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
OpenPOWER on IntegriCloud