From: Karel Zak <kzak@redhat.com>
Date: Thu, 21 Jul 2011 09:26:42 +0000 (+0200)
Subject: Merge branch 'minix' of https://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.20-rc1~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e844147d17337ffa492ad8ca4887e1e0112ec409;p=thirdparty%2Futil-linux.git

Merge branch 'minix' of https://github.com/kerolasa/lelux-utiliteetit

* 'minix' of https://github.com/kerolasa/lelux-utiliteetit:
  libblkid: move MINIX_MAXPARTITIONS to minix.h
  minix: move globals and inline functions to minix_programs.h
  libblkid: use MINIX_BLOCK_SIZE from minix.h
  libblkid: use superblock structure from minix.h
  include: move minix.h to include directory
  include: remove kernel headers from minix.h
  include: minix.h: use data types from stdint.h

Conflicts:
	disk-utils/Makefile.am

Signed-off-by: Karel Zak <kzak@redhat.com>
---

e844147d17337ffa492ad8ca4887e1e0112ec409
diff --cc disk-utils/Makefile.am
index a7c2eaa508,4816c1fb2e..69072e1dfe
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@@ -15,9 -15,9 +15,10 @@@ dist_man_MANS = isosize.8 mkfs.8 mkswap
  
  sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs
  
- fsck_minix_SOURCES = fsck.minix.c minix.h $(top_srcdir)/lib/ismounted.c
- mkfs_minix_SOURCES = mkfs.minix.c minix.h mkfs.h $(utils_common) $(top_srcdir)/lib/strutils.c
+ fsck_minix_SOURCES = fsck.minix.c minix_programs.h $(top_srcdir)/lib/ismounted.c
 -mkfs_minix_SOURCES = mkfs.minix.c minix_programs.h mkfs.h $(utils_common) $(top_srcdir)/lib/strutils.c
 -mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common)
++mkfs_minix_SOURCES = mkfs.minix.c minix_programs.h mkfs.h $(utils_common) \
++		    $(top_srcdir)/lib/strutils.c
 +mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common) $(top_srcdir)/lib/strutils.c
  
  swaplabel_SOURCES = swaplabel.c $(utils_common)
  swaplabel_LDADD = $(uuid_ldadd)