summaryrefslogtreecommitdiffstats
path: root/arch/sparc/boot/piggyback_64.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-12-03 13:49:39 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-12-03 13:49:39 +0100
commit220d0b1dbf78c6417a658c96e571415552d3abac (patch)
tree70cd3862540c38ea490e7a27c3c7acc35b680234 /arch/sparc/boot/piggyback_64.c
parent474b18ccc264c472abeec50f48469b6477202699 (diff)
parent22763c5cf3690a681551162c15d34d935308c8d7 (diff)
downloadlinux-stable-220d0b1dbf78c6417a658c96e571415552d3abac.tar.gz
linux-stable-220d0b1dbf78c6417a658c96e571415552d3abac.tar.bz2
linux-stable-220d0b1dbf78c6417a658c96e571415552d3abac.zip
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'arch/sparc/boot/piggyback_64.c')
-rw-r--r--arch/sparc/boot/piggyback_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/boot/piggyback_64.c b/arch/sparc/boot/piggyback_64.c
index c63fd1b6bdd4..a26a686cb5aa 100644
--- a/arch/sparc/boot/piggyback_64.c
+++ b/arch/sparc/boot/piggyback_64.c
@@ -32,7 +32,7 @@
/* Note: run this on an a.out kernel (use elftoaout for it), as PROM looks for a.out image onlly
usage: piggyback vmlinux System.map tail, where tail is gzipped fs of the initial ramdisk */
-void die(char *str)
+static void die(char *str)
{
perror (str);
exit(1);