diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /scripts/gen_initramfs_list.sh | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'scripts/gen_initramfs_list.sh')
| -rw-r--r-- | scripts/gen_initramfs_list.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh index 55caecdad99..e12b1a7525c 100644 --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh | |||
| @@ -284,7 +284,7 @@ while [ $# -gt 0 ]; do | |||
| 284 | done | 284 | done |
| 285 | 285 | ||
| 286 | # If output_file is set we will generate cpio archive and compress it | 286 | # If output_file is set we will generate cpio archive and compress it |
| 287 | # we are carefull to delete tmp files | 287 | # we are careful to delete tmp files |
| 288 | if [ ! -z ${output_file} ]; then | 288 | if [ ! -z ${output_file} ]; then |
| 289 | if [ -z ${cpio_file} ]; then | 289 | if [ -z ${cpio_file} ]; then |
| 290 | cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)" | 290 | cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)" |