Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4a2fed3 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'gpio-drivers-only-driver-h' into devel

parents adbf0299 7220c43a

drivers/gpio/gpio-74x164.c

+2 −3
Original line number Diff line number Diff line
@@ -9,12 +9,11 @@ 
 *  published by the Free Software Foundation.

 */



#include <linux/gpio/consumer.h>

#include <linux/init.h>

#include <linux/mutex.h>

#include <linux/spi/spi.h>

#include <linux/gpio.h>

#include <linux/of_gpio.h>

#include <linux/gpio/driver.h>

#include <linux/gpio/consumer.h>

#include <linux/slab.h>

#include <linux/module.h>

drivers/gpio/gpio-adp5520.c

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/mfd/adp5520.h>



#include <linux/gpio.h>

#include <linux/gpio/driver.h>



struct adp5520_gpio {

	struct device *master;

drivers/gpio/gpio-adp5588.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <linux/slab.h>

#include <linux/init.h>

#include <linux/i2c.h>

#include <linux/gpio.h>

#include <linux/gpio/driver.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

drivers/gpio/gpio-altera.c

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 


#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_gpio.h>

#include <linux/gpio/driver.h>

#include <linux/of_gpio.h> /* For of_mm_gpio_chip */

#include <linux/platform_device.h>



#define ALTERA_GPIO_MAX_NGPIO		32

drivers/gpio/gpio-amd8111.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/ioport.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/gpio.h>

#include <linux/gpio/driver.h>

#include <linux/pci.h>

#include <linux/spinlock.h>