--- a/Makefile.conf.in  Thu Oct 18 16:43:53 2007 +0200
+++ b/Makefile.conf.in  Thu Oct 18 16:45:15 2007 +0200
@@ -67,9 +67,13 @@ SNDVERSIONS  = $(TOPDIR)/include/sndversi
 SNDVERSIONS	= $(TOPDIR)/include/sndversions.h
 DEXPORT		= $(TOPDIR)/include/modules
 else
+# 2.6 kbuild
 EXTRA_CFLAGS += -DALSA_BUILD
+LINUXINCLUDE := -I$(MAINSRCDIR)/include $(LINUXINCLUDE)
 CPPFLAGS := -I$(MAINSRCDIR)/include $(CPPFLAGS)
-CFLAGS := -I$(MAINSRCDIR)/include $(CFLAGS)
+KBUILD_CPPFLAGS := -I$(MAINSRCDIR)/include $(KBUILD_CPPFLAGS)
+# 2.6.24 complains this override...
+# CFLAGS := -I$(MAINSRCDIR)/include $(CFLAGS)
 MAKE_ADDS = @MAKE_ADDS@
 endif
 
--- a/configure.in      Thu Oct 18 16:43:53 2007 +0200
+++ b/configure.in      Thu Oct 18 16:45:15 2007 +0200
@@ -121,9 +121,9 @@ if test -n "$kernelbuild"; then
   fi
   if test -d "$kernelbuild/include2"; then
     kpath="$kpath -I$kernelbuild/include2"
+    MAKE_ADDS="O=$kernelbuild"
   fi
   KERNEL_INC="$kpath $KERNEL_INC"
-  MAKE_ADDS="O=$kernelbuild"
 fi
 HACK_KERNEL_INC=""
 ac_save_CFLAGS="$CFLAGS"