summaryrefslogtreecommitdiffstats
path: root/arch/alpha/boot
diff options
context:
space:
mode:
authorYoann Padioleau <padator@wanadoo.fr>2007-06-01 09:46:36 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-01 17:18:28 +0200
commitf8343685643f2901fe11aa9d0358cafbeaf7b4c3 (patch)
tree08cad541c6668d0372aa5c394792735dfdb06f30 /arch/alpha/boot
parentpotential parse error in ifdef (diff)
downloadlinux-f8343685643f2901fe11aa9d0358cafbeaf7b4c3.tar.xz
linux-f8343685643f2901fe11aa9d0358cafbeaf7b4c3.zip
parse errors in ifdefs
Fix various bits of obviously-busted code which we're not happening to compile, due to ifdefs. Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Jeff Garzik <jeff@garzik.org> Cc: Jan Kara <jack@ucw.cz> Cc: James Bottomley <James.Bottomley@steeleye.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/alpha/boot')
-rw-r--r--arch/alpha/boot/tools/mkbb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/boot/tools/mkbb.c b/arch/alpha/boot/tools/mkbb.c
index 23c7190b047c..632a7fd6d7dc 100644
--- a/arch/alpha/boot/tools/mkbb.c
+++ b/arch/alpha/boot/tools/mkbb.c
@@ -81,7 +81,7 @@ typedef union __bootblock {
#define bootblock_label __u1.__label
#define bootblock_checksum __u2.__checksum
-main(int argc, char ** argv)
+int main(int argc, char ** argv)
{
bootblock bootblock_from_disk;
bootblock bootloader_image;