Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / bt8xxgpio.c

diff --git a/drivers/gpio/bt8xxgpio.c b/drivers/gpio/bt8xxgpio.c
index 55904140213bdd2ebc6b3f952787737b4f166c63..2559f2289409f13c431bd60d9ff95a503813b8b1 100644 (file)
--- a/drivers/gpio/bt8xxgpio.c
+++ b/drivers/gpio/bt8xxgpio.c
@@ -46,8 +46,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
-
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 /* Steal the hardware definitions from the bttv driver. */
 #include "../media/video/bt8xx/bt848.h"