Merge branch 'fs-config' into for-hpa/elflink/ldlinux

Conflicts:
	com32/elflink/ldlinux/readconfig.c

diff --cc com32/elflink/ldlinux/readconfig.c
index 408fe03,7d0dd67..b845d9a
--- 1/com32/elflink/ldlinux/readconfig.c
--- 2/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@@ -11,7 -11,7 +11,8 @@@
   *
   * ----------------------------------------------------------------------- */
  
 +#include <sys/io.h>
+ #include <fcntl.h>
  #include <stdio.h>
  #include <stdbool.h>
  #include <stdlib.h>
@@@ -24,7 -24,7 +25,8 @@@
  #include <syslinux/adv.h>
  #include <syslinux/config.h>
  #include <dprintf.h>
 +#include <ctype.h>
+ #include <core.h>
  
  #include "menu.h"
  #include "config.h"