Merge branch 'master' of pisa@rtime.felk.cvut.cz:/var/git/omk

diff --combined snippets/linux.omk
index bb51fefb40f2d91f04116616bb9582e41b793add,6bbd8cd17c2a147bf124978bbf09cb73b8b34533..9cf8f5c6206507d4b3aadaa28167210dcc4a596c
--- 1/snippets/linux.omk
--- 2/snippets/linux.omk
+++ b/snippets/linux.omk
@@@ -428,7 -428,7 +428,7 @@@ include $(KERN_LIB_DIR)/kernel.m
  ifeq ($(LINUX_SRC),)
  LINUX_SRC = $(LINUX_DIR)
  endif
- kernel_INCLUDES += -I $(LINUX_DIR) -idirafter $(LINUX_SRC)/include/linux
+ kernel_INCLUDES += -I $(KERN_INCLUDE_DIR) -I $(LINUX_DIR) -idirafter $(LINUX_SRC)/include/linux
  
  ifdef LINUX_CC
  KERN_CC = $(LINUX_CC)
@@@ -438,7 -438,7 +438,7 @@@ KERN_CC = echo KERN_CC not defined - co
  endif
  c_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_CFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc
  cc_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_CFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB
- S_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_AFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB
+ S_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_AFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc
  KERN_EXE_SUFFIX := $(LINUX_MODULE_EXT)
  KERN_LDFLAGS = $(LINUX_LDFLAGS)
  ifdef LINUX_ARCH
@@@ -663,7 -663,7 +663,7 @@@ MODULES_LIST := $(MODULES_LIST:%.mod.st
  define MODPOST_kern_template
  $(2) : $(1)$(KERN_LINK_SUFFIX) $(1).mod.c
        @$(QUIET_CMD_ECHO) "  LD [M]  $$@"
 -      $(Q) $$(cc_o_kern_COMPILE) -D"KBUILD_BASENAME=$(KERN_MQ)$(1)$(KERN_MQ)" \
 +      $(Q) $$(c_o_kern_COMPILE) -D"KBUILD_BASENAME=$(KERN_MQ)$(1)$(KERN_MQ)" \
                -D"KBUILD_MODNAME=$(KERN_MQ)$(1)$(KERN_MQ)" \
                -o $(1).mod.o -c $(1).mod.c
        $(Q) $$(KERN_LD) $$(KERN_LDFLAGS) $(1)$(KERN_LINK_SUFFIX) $(1).mod.o -r -o $$@