Fixes to build on gfmn100.
Change-Id: I012610511056cd2d173d04f07ee86a233f2c95a8
diff --git a/backport-include/asm/barrier.h b/backport-include/asm/barrier.h
index 423a581..511253d 100644
--- a/backport-include/asm/barrier.h
+++ b/backport-include/asm/barrier.h
@@ -2,9 +2,9 @@
#define __BACKPORT_ASM_BARRIER_H
#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
#include_next <asm/barrier.h>
-#endif /* >= 3.4 */
+#endif /* >= 3.3 */
#ifndef dma_rmb
#define dma_rmb() rmb()
diff --git a/compat/Kconfig b/compat/Kconfig
index e64e128..885a780 100644
--- a/compat/Kconfig
+++ b/compat/Kconfig
@@ -83,8 +83,9 @@
depends on HAS_DMA
# Build on other kernels kernels < 3.9 if HAVE_GENERIC_DMA_COHERENT is
# not set. Kernels >= 3.8 have this if HAS_DMA is set.
- depends on (!HAVE_GENERIC_DMA_COHERENT && KERNEL_3_8)
+ depends on KERNEL_3_8
# Always build if on 3.3 - 3.5
+ depends on (KERNEL_3_6 || !HAVE_GENERIC_DMA_COHERENT)
default y if (KERNEL_3_4 || KERNEL_3_5 || KERNEL_3_6)
# build for testing
default y if BPAUTO_USERSEL_BUILD_ALL
