projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpio
/
gpio-bt8xx.c
diff --git
a/drivers/gpio/gpio-bt8xx.c
b/drivers/gpio/gpio-bt8xx.c
index aba97abda77cff7856a41aef420aa5735aacb4e3..7d9d7cb35f2861ffeb0ba4f83b575a1cedb00add 100644
(file)
--- a/
drivers/gpio/gpio-bt8xx.c
+++ b/
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 */