From d608bdc6b79a4a862424c2806d373d7caf59f728 Mon Sep 17 00:00:00 2001
From: Michal Marek <mmarek@suse.cz>
Date: Wed, 10 Mar 2010 12:28:58 +0100
Subject: [PATCH] --- yaml --- r: 199557 b: refs/heads/master c:
 73d1393eb8507ed5fd7f8e696f6b1ecc18035ebe h: refs/heads/master i:   199555:
 eaca4de7e241fe75883d32aaa917b9122070ef1d v: v3

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

diff --git a/[refs] b/[refs]
index dbc184bf418b..5f8b76365cc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e93bc1a0cab3e54e3c1947e01c8e73892e35630d
+refs/heads/master: 73d1393eb8507ed5fd7f8e696f6b1ecc18035ebe
diff --git a/trunk/Makefile b/trunk/Makefile
index 160cadadc471..b98943a466c5 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1086,7 +1086,7 @@ ifdef CONFIG_MODULES
 
 # By default, build modules as well
 
-all: modules modules.builtin
+all: modules
 
 #	Build modules
 #
@@ -1104,7 +1104,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
 modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
 	$(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin
 
-%/modules.builtin: include/config/auto.conf | modules
+%/modules.builtin: include/config/auto.conf
 	$(Q)$(MAKE) $(modbuiltin)=$*
 
 
@@ -1117,7 +1117,7 @@ PHONY += modules_install
 modules_install: _modinst_ _modinst_post
 
 PHONY += _modinst_
-_modinst_:
+_modinst_: modules.builtin
 	@if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \
 		echo "Warning: you may need to install module-init-tools"; \
 		echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\