From 33b3fba91168fc2dc9495e3e94bd87ffc7e21567 Mon Sep 17 00:00:00 2001
From: Cheng Renquan <crq@kernel.org>
Date: Tue, 26 May 2009 16:03:07 +0800
Subject: [PATCH] --- yaml --- r: 149519 b: refs/heads/master c:
 b8b0618cf6fab3bd5b1da8c72f4b29847d81ac42 h: refs/heads/master i:   149517:
 1618548c73bac1ee0806c11e31b670e4c3beb3b3   149515:
 ba088f1ce76d90b6991b8403c668c8ea3325a56f   149511:
 ab45910206b9014c2884a582894e8d1117d761c9   149503:
 95bf031cb42393790ffe115e7975452420b84169 v: v3

---
 [refs]         |  2 +-
 trunk/Makefile | 26 +++++++++-----------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index d900ea6faadb..1776e725f586 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e56f08bffe9e3e2b936eb73bd51d8800d1b42c2
+refs/heads/master: b8b0618cf6fab3bd5b1da8c72f4b29847d81ac42
diff --git a/trunk/Makefile b/trunk/Makefile
index 106515492089..0c8ee91bc26a 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -35,10 +35,8 @@ MAKEFLAGS += -rR --no-print-directory
 # To put more focus on warnings, be less verbose as default
 # Use 'make V=1' to see the full commands
 
-ifdef V
-  ifeq ("$(origin V)", "command line")
-    KBUILD_VERBOSE = $(V)
-  endif
+ifeq ("$(origin V)", "command line")
+  KBUILD_VERBOSE = $(V)
 endif
 ifndef KBUILD_VERBOSE
   KBUILD_VERBOSE = 0
@@ -54,10 +52,8 @@ endif
 # See the file "Documentation/sparse.txt" for more details, including
 # where to get the "sparse" utility.
 
-ifdef C
-  ifeq ("$(origin C)", "command line")
-    KBUILD_CHECKSRC = $(C)
-  endif
+ifeq ("$(origin C)", "command line")
+  KBUILD_CHECKSRC = $(C)
 endif
 ifndef KBUILD_CHECKSRC
   KBUILD_CHECKSRC = 0
@@ -69,12 +65,10 @@ endif
 ifdef SUBDIRS
   KBUILD_EXTMOD ?= $(SUBDIRS)
 endif
-ifdef M
-  ifeq ("$(origin M)", "command line")
-    KBUILD_EXTMOD := $(M)
-  endif
-endif
 
+ifeq ("$(origin M)", "command line")
+  KBUILD_EXTMOD := $(M)
+endif
 
 # kbuild supports saving output files in a separate directory.
 # To locate output files in a separate directory two syntaxes are supported.
@@ -98,10 +92,8 @@ ifeq ($(KBUILD_SRC),)
 
 # OK, Make called in directory where kernel src resides
 # Do we want to locate output files in a separate directory?
-ifdef O
-  ifeq ("$(origin O)", "command line")
-    KBUILD_OUTPUT := $(O)
-  endif
+ifeq ("$(origin O)", "command line")
+  KBUILD_OUTPUT := $(O)
 endif
 
 # That's our default target when none is given on the command line