Merge tag 'upstream-3.16-rc1-v2' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / arch / cris / Makefile

diff --git a/arch/cris/Makefile b/arch/cris/Makefile
index 29c2ceb38a76dd05fb98e9728e53b2d0753df0df..39dc7d00083e10d393337a66bb0225052accf0cb 100644 (file)
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -23,7 +23,9 @@ mach-$(CONFIG_ETRAXFS) := fs
 
 ifneq ($(arch-y),)
 SARCH := arch-$(arch-y)
-inc := -Iarch/cris/include/$(SARCH)
+inc := -Iarch/cris/include/uapi/$(SARCH)
+inc += -Iarch/cris/include/$(SARCH)
+inc += -Iarch/cris/include/uapi/$(SARCH)/arch
 inc += -Iarch/cris/include/$(SARCH)/arch
 else
 SARCH :=