From: Tony Breeds <tony@bakeyournoodle.com>
Date: Fri, 16 Jul 2010 05:11:38 +0000 (+1000)
Subject: Merge branch 'devel'
X-Git-Tag: yaboot-1.3.17-rc1~26
X-Git-Url: https://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=8aef1508bddad47681e258e9f2eaa7987cbd8a32;hp=-c

Merge branch 'devel'
---

8aef1508bddad47681e258e9f2eaa7987cbd8a32
diff --combined Makefile
index d975e4e,4c35c67..336ac52
--- a/Makefile
+++ b/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  
  include Config
  
 -VERSION = 1.3.14
 +VERSION = 1.3.16
  # Debug mode (spam/verbose)
  DEBUG = 0
  # make install vars
@@@ -83,7 -83,8 +83,8 @@@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr
  
  OBJS = second/crt0.o second/yaboot.o second/cache.o second/prom.o second/file.o \
  	second/partition.o second/fs.o second/cfg.o second/setjmp.o second/cmdline.o \
- 	second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \
+ 	second/fs_of.o second/fs_ext2.o second/fs_iso.o second/fs_swap.o \
+ 	second/iso_util.o \
  	lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
  
  ifeq ($(USE_MD5_PASSWORDS),y)