From e880ea9813363aec2c27c5e93504cbb7b1387b19 Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Mon, 28 Jun 2010 10:45:21 +0800
Subject: [PATCH] --- yaml --- r: 204823 b: refs/heads/master c:
 01ab17887f4cdcb8bb5a5d1bc3b160d186e6e99b h: refs/heads/master i:   204821:
 337ba291964dbe05f56057a253345fd30c9c3817   204819:
 69b1aeb5aaf8b172d638b470a6ec69fb61f11ef2   204815:
 abf5cde8170a8ada3500e286f4b155f29a777f01 v: v3

---
 [refs]         | 2 +-
 trunk/Makefile | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 94f716dc49a2..ee22509c1862 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8af8b28326f2b4565705125506ce8947e08587b1
+refs/heads/master: 01ab17887f4cdcb8bb5a5d1bc3b160d186e6e99b
diff --git a/trunk/Makefile b/trunk/Makefile
index a86ac8c4798e..dceb4f19f786 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -414,7 +414,7 @@ endif
 no-dot-config-targets := clean mrproper distclean \
 			 cscope TAGS tags help %docs check% \
 			 include/linux/version.h headers_% \
-			 kernelrelease kernelversion
+			 kernelversion
 
 config-targets := 0
 mixed-targets  := 0
@@ -1395,9 +1395,9 @@ checkstack:
 	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
 	$(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
 
-kernelrelease:
-	$(if $(wildcard include/config/kernel.release), $(Q)echo $(KERNELRELEASE), \
-	$(error kernelrelease not valid - run 'make prepare' to update it))
+kernelrelease: include/config/kernel.release
+	@echo $(KERNELRELEASE)
+
 kernelversion:
 	@echo $(KERNELVERSION)