---

yaml --- r: 288869 b: refs/heads/master c: e250b34 h: refs/heads/master i: 288867: a997f94 v: v3
git-mirror · Feb 9, 2012 · fd1cb9f · fd1cb9f
1 parent 70fb1dd
commit fd1cb9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14c1bf8a8920f36f6e0603a2ff920b48eec14387
+refs/heads/master: e250b34e57888ebe829a0b89cfa8ad303ad5ae74
diff --git a/trunk/drivers/w1/masters/w1-gpio.c b/trunk/drivers/w1/masters/w1-gpio.c
@@ -13,12 +13,11 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/w1-gpio.h>
+#include <linux/gpio.h>
 
 #include "../w1.h"
 #include "../w1_int.h"
 
-#include <asm/gpio.h>
-
 static void w1_gpio_write_bit_dir(void *data, u8 bit)
 {
 	struct w1_gpio_platform_data *pdata = data;