diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-04 11:33:55 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-09 11:36:05 -0500 |
commit | e250b34e57888ebe829a0b89cfa8ad303ad5ae74 (patch) | |
tree | 806bfd8c52ebab4bfd7f400fc32d03e53e6b653c /drivers/w1 | |
parent | 14c1bf8a8920f36f6e0603a2ff920b48eec14387 (diff) |
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.c | 3 |
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 @@ | |||
13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
14 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
15 | #include <linux/w1-gpio.h> | 15 | #include <linux/w1-gpio.h> |
16 | #include <linux/gpio.h> | ||
16 | 17 | ||
17 | #include "../w1.h" | 18 | #include "../w1.h" |
18 | #include "../w1_int.h" | 19 | #include "../w1_int.h" |
19 | 20 | ||
20 | #include <asm/gpio.h> | ||
21 | |||
22 | static void w1_gpio_write_bit_dir(void *data, u8 bit) | 21 | static void w1_gpio_write_bit_dir(void *data, u8 bit) |
23 | { | 22 | { |
24 | struct w1_gpio_platform_data *pdata = data; | 23 | struct w1_gpio_platform_data *pdata = data; |