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

[~andy/linux] / drivers / media / pci / cx23885 / cx23885-f300.c

diff --git a/drivers/media/pci/cx23885/cx23885-f300.c b/drivers/media/pci/cx23885/cx23885-f300.c
index 93998f2209865e8dc5affaaef86758606e3df91c..5444cc526008706d1a6b7a4c87e4aa0da923a22f 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-f300.c
+++ b/drivers/media/pci/cx23885/cx23885-f300.c
@@ -29,6 +29,7 @@
  */
 
 #include "cx23885.h"
+#include "cx23885-f300.h"
 
 #define F300_DATA      GPIO_0
 #define F300_RESET     GPIO_1