From fd1cb9f2e2b49d68580e6ea2badbe60734415001 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 4 Feb 2012 16:33:55 +0000
Subject: [PATCH] --- yaml --- r: 288869 b: refs/heads/master c:
 e250b34e57888ebe829a0b89cfa8ad303ad5ae74 h: refs/heads/master i:   288867:
 a997f942dc360e85a85d84f60492c8630a44dbb9 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/w1/masters/w1-gpio.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8d6c0e1e4bfc..3c71e5d1d22a 100644
--- 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
index fcbe742188a5..df600d14974d 100644
--- 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;