From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 4 Feb 2012 16:33:55 +0000 (+0000)
Subject: w1: Use linux/gpio.h rather than asm/gpio.h
X-Git-Tag: v3.4-rc1~187^2~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e250b34e57888ebe829a0b89cfa8ad303ad5ae74;p=karo-tx-linux.git

w1: Use linux/gpio.h rather than asm/gpio.h

Direct inclusion of the asm header has long been deprecated by the
introduction of gpiolib.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index fcbe742188a5..df600d14974d 100644
--- a/drivers/w1/masters/w1-gpio.c
+++ b/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;