--- kernel/conftest.sh	2013-01-14 17:38:53.000000000 -0500
+++ kernel/conftest.sh	2013-02-27 10:12:28.000000000 -0500
@@ -165,7 +165,6 @@
         CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
     elif [ "$ARCH" = "arm" ]; then
         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include"
-        CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include/uapi"
         CFLAGS="$CFLAGS -I$OUTPUT/arch/arm/include/generated"
         CFLAGS="$CFLAGS -I$OUTPUT/arch/arm/include/generated/uapi"
     fi
@@ -1699,10 +1698,12 @@
                 # kernel older than 2.6.6, that's all we require to
                 # build the module.
                 #
+                VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
                 PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
                 SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
 
-                if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
+                if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
+                   [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
                         -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
                     SELECTED_MAKEFILE=Makefile.kbuild
                     RET=0