diff --git a/[refs] b/[refs]
index 27bb0a0b0747..a89627de6e70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9d2f0573e918d0b2ed08ece1c4bfe850477f8cf
+refs/heads/master: 52d322582bb71cea92a9a039c7074b3a453e518a
diff --git a/trunk/drivers/gpio/gpio-bt8xx.c b/trunk/drivers/gpio/gpio-bt8xx.c
index e4cc7eb69bb2..92d555d5c25a 100644
--- a/trunk/drivers/gpio/gpio-bt8xx.c
+++ b/trunk/drivers/gpio/gpio-bt8xx.c
@@ -50,7 +50,7 @@
 #include <linux/slab.h>
 
 /* Steal the hardware definitions from the bttv driver. */
-#include "../media/video/bt8xx/bt848.h"
+#include "../media/pci/bt8xx/bt848.h"
 
 
 #define BT8XXGPIO_NR_GPIOS		24 /* We have 24 GPIO pins */