summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-04 16:33:55 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-09 08:36:05 -0800
commite250b34e57888ebe829a0b89cfa8ad303ad5ae74 (patch)
tree806bfd8c52ebab4bfd7f400fc32d03e53e6b653c /drivers/w1
parent14c1bf8a8920f36f6e0603a2ff920b48eec14387 (diff)
downloadlinux-e250b34e57888ebe829a0b89cfa8ad303ad5ae74.tar.gz
linux-e250b34e57888ebe829a0b89cfa8ad303ad5ae74.tar.bz2
linux-e250b34e57888ebe829a0b89cfa8ad303ad5ae74.zip
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>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/masters/w1-gpio.c3
1 files changed, 1 insertions, 2 deletions
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;