summaryrefslogtreecommitdiff
path: root/fs/coda/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-05-18 19:06:31 +0400
committerJiri Kosina <jkosina@suse.cz>2011-05-18 19:06:49 +0400
commit6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a (patch)
treef2f77cc31b4548745778fca6a51b09e1d8a49804 /fs/coda/Makefile
parentb50f315cbb865079a16a12fd9ae6083f98fd592c (diff)
parentc1d10d18c542278b7fbc413c289d3cb6219da6b3 (diff)
downloadlinux-6b7b8e488bbdedeccabdd001a78ffcbe43bb8a3a.tar.xz
Merge branch 'master' into upstream.
This is sync with Linus' tree to receive KEY_IMAGES definition that went in through input tree.
Diffstat (limited to 'fs/coda/Makefile')
-rw-r--r--fs/coda/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/coda/Makefile b/fs/coda/Makefile
index 6c22e61da397..1bab69a0d347 100644
--- a/fs/coda/Makefile
+++ b/fs/coda/Makefile
@@ -9,4 +9,4 @@ coda-objs := psdev.o cache.o cnode.o inode.o dir.o file.o upcall.o \
# If you want debugging output, please uncomment the following line.
-# EXTRA_CFLAGS += -DDEBUG -DDEBUG_SMB_MALLOC=1
+# ccflags-y := -DDEBUG -DDEBUG_SMB_MALLOC=1