From: Nickolay <nickolay@protei.ru>
Date: Fri, 9 Jun 2006 17:24:14 +0000 (+0400)
Subject: kbuild: bugfix with initramfs
X-Git-Tag: v2.6.18-rc1~602^2~13
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ff5417107b7615fcef772cabcb717f4a715ffadc;p=linux-2.6-omap-h63xx.git

kbuild: bugfix with initramfs

This patch fix double inclusion of ramfs-input.

Signed-off-by: Nickolay Vinogradov <nickolay@protei.ru>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

diff --git a/usr/Makefile b/usr/Makefile
index 19d74e6f268..e93824269da 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -21,8 +21,7 @@ ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \
                     $(CONFIG_INITRAMFS_SOURCE),-d)
 ramfs-args  := \
         $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \
-        $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) \
-        $(ramfs-input)
+        $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID))
 
 # .initramfs_data.cpio.gz.d is used to identify all files included
 # in initramfs and to detect if any files are added/removed.