summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorNickolay <nickolay@protei.ru>2006-06-09 21:24:14 +0400
committerSam Ravnborg <sam@mars.ravnborg.org>2006-06-10 09:07:04 +0200
commitff5417107b7615fcef772cabcb717f4a715ffadc (patch)
tree80141c25462524a559764df128016584cce8cf6c /usr
parent6449bd621ba51ef652ac5bda632eeabbc18dd296 (diff)
downloadlinux-next-ff5417107b7615fcef772cabcb717f4a715ffadc.tar.gz
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>
Diffstat (limited to 'usr')
-rw-r--r--usr/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/Makefile b/usr/Makefile
index 19d74e6f2685..e93824269da2 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.