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>

diff --cc disk-utils/Makefile.am
index a7c2eaa5083c03f377bc4a713c539bdc561f9aa2,4816c1fb2ed321fc6422f4e0009cccc88ef90496..69072e1dfedf731ba36d7eb3e3dcba0d53ec2228
--- 1/disk-utils/Makefile.am
--- 2/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)