diff --git a/[refs] b/[refs]
index 0752361e12b8..be42e21dcbe2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d509835e32bd761a2b7b446034a273da568e5573
+refs/heads/master: f9b26cd8e2cb8979694c48ea642d30784e7aceb3
diff --git a/trunk/drivers/media/video/smiapp/Makefile b/trunk/drivers/media/video/smiapp/Makefile
index 5a207eecd357..36b0cfa2c541 100644
--- a/trunk/drivers/media/video/smiapp/Makefile
+++ b/trunk/drivers/media/video/smiapp/Makefile
@@ -1,3 +1,5 @@
 smiapp-objs			+= smiapp-core.o smiapp-regs.o \
 				   smiapp-quirk.o smiapp-limits.o
 obj-$(CONFIG_VIDEO_SMIAPP)	+= smiapp.o
+
+ccflags-y += -Idrivers/media/video
diff --git a/trunk/drivers/media/video/smiapp/smiapp.h b/trunk/drivers/media/video/smiapp/smiapp.h
index 805d8c8a3c18..35b9216e48cd 100644
--- a/trunk/drivers/media/video/smiapp/smiapp.h
+++ b/trunk/drivers/media/video/smiapp/smiapp.h
@@ -30,7 +30,7 @@
 #include <media/v4l2-subdev.h>
 #include <media/smiapp.h>
 
-#include "../smiapp-pll.h"
+#include "smiapp-pll.h"
 #include "smiapp-reg.h"
 #include "smiapp-regs.h"
 #include "smiapp-quirk.h"