diff options
| author | Andi Kleen <andi@basil.nowhere.org> | 2006-11-28 20:12:29 +0100 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-11-28 20:12:29 +0100 |
| commit | a3550a9c543556cf7764be81aeb17c6dab440753 (patch) | |
| tree | e8c8bf721cc917c8842c4a007ad4b3f68eb7aa1e /usr/Makefile | |
| parent | 9a14f2964b459c18198ee59ff7212321def82df7 (diff) | |
| parent | 2ea5814472c3c910aed5c5b60f1f3b1000e353f1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'usr/Makefile')
| -rw-r--r-- | usr/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/Makefile b/usr/Makefile index e338e7bedb2..382702ad663 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -20,7 +20,7 @@ $(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE hostprogs-y := gen_init_cpio initramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \ - $(CONFIG_INITRAMFS_SOURCE),-d) + $(shell echo $(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)) |