[FILO] r100 - in trunk/filo/main: . grub

Author: stepan
Date: 2009-07-18 16:39:30 +0200 (Sat, 18 Jul 2009)
New Revision: 100

Modified:
   trunk/filo/main/filo.c
   trunk/filo/main/grub/builtins.c
Log:
fix compilation of FILO if no keyboard support 
is compiled into libpayload.

Modified: trunk/filo/main/filo.c
===================================================================
--- trunk/filo/main/filo.c	2009-07-06 13:38:22 UTC (rev 99)
+++ trunk/filo/main/filo.c	2009-07-18 14:39:30 UTC (rev 100)
@@ -118,7 +118,9 @@

/* Initialize */
     init();
+#ifdef CONFIG_PC_KEYBOARD
     keyboard_add_reset_handler(reset_handler);
+#endif
     grub_menulst();
     grub_main();
     return 0;

Modified: trunk/filo/main/grub/builtins.c
===================================================================
--- trunk/filo/main/grub/builtins.c	2009-07-06 13:38:22 UTC (rev 99)
+++ trunk/filo/main/grub/builtins.c	2009-07-18 14:39:30 UTC (rev 100)
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */

-
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <config.h>
 #include <fs.h>
@@ -1589,11 +1589,16 @@

static int keymap_func(char *arg, int flags)
 {
+#ifdef CONFIG_PC_KEYBOARD
    if (keyboard_set_layout(arg)) {
    	errnum = ERR_BAD_ARGUMENT;
    	return 1;
    }
    return 0;
+#else
+	errnum = ERR_BAD_ARGUMENT;
+	return 1;
+#endif
 }

static struct builtin builtin_keymap = {