Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[cascardo/linux.git] / arch / blackfin / mach-bf538 / ext-gpio.c

diff --git a/arch/blackfin/mach-bf538/ext-gpio.c b/arch/blackfin/mach-bf538/ext-gpio.c
index 471a9b1..48c1002 100644 (file)
--- a/arch/blackfin/mach-bf538/ext-gpio.c
+++ b/arch/blackfin/mach-bf538/ext-gpio.c
@@ -8,8 +8,8 @@
 
 #include <linux/module.h>
 #include <linux/err.h>
+#include <linux/gpio.h>
 #include <asm/blackfin.h>
-#include <asm/gpio.h>
 #include <asm/portmux.h>
 
 #define DEFINE_REG(reg, off) \
@@ -116,9 +116,9 @@ static struct gpio_chip bf538_porte_chip = {
 
 static int __init bf538_extgpio_setup(void)
 {
-       return gpiochip_add(&bf538_portc_chip) |
-               gpiochip_add(&bf538_portd_chip) |
-               gpiochip_add(&bf538_porte_chip);
+       return gpiochip_add_data(&bf538_portc_chip, NULL) |
+               gpiochip_add_data(&bf538_portd_chip, NULL) |
+               gpiochip_add_data(&bf538_porte_chip, NULL);
 }
 arch_initcall(bf538_extgpio_setup);