Commit 7a9cc489 authored by Sonic Zhang's avatar Sonic Zhang Committed by Mike Frysinger

Blackfin: bf537-stamp: unify duplicated ADP5588 headers

Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 01218654
...@@ -20,10 +20,11 @@ ...@@ -20,10 +20,11 @@
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
#include <linux/usb/isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/i2c.h>
#include <linux/i2c/adp5588.h>
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/i2c.h>
#include <linux/usb/sl811.h> #include <linux/usb/sl811.h>
#include <linux/spi/mmc_spi.h> #include <linux/spi/mmc_spi.h>
#include <linux/leds.h> #include <linux/leds.h>
...@@ -1335,7 +1336,6 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -1335,7 +1336,6 @@ static struct platform_device i2c_bfin_twi_device = {
#endif #endif
#if defined(CONFIG_KEYBOARD_ADP5588) || defined(CONFIG_KEYBOARD_ADP5588_MODULE) #if defined(CONFIG_KEYBOARD_ADP5588) || defined(CONFIG_KEYBOARD_ADP5588_MODULE)
#include <linux/i2c/adp5588.h>
static const unsigned short adp5588_keymap[ADP5588_KEYMAPSIZE] = { static const unsigned short adp5588_keymap[ADP5588_KEYMAPSIZE] = {
[0] = KEY_GRAVE, [0] = KEY_GRAVE,
[1] = KEY_1, [1] = KEY_1,
...@@ -1532,7 +1532,6 @@ static struct adp5520_platform_data adp5520_pdev_data = { ...@@ -1532,7 +1532,6 @@ static struct adp5520_platform_data adp5520_pdev_data = {
#endif #endif
#if defined(CONFIG_GPIO_ADP5588) || defined(CONFIG_GPIO_ADP5588_MODULE) #if defined(CONFIG_GPIO_ADP5588) || defined(CONFIG_GPIO_ADP5588_MODULE)
#include <linux/i2c/adp5588.h>
static struct adp5588_gpio_platform_data adp5588_gpio_data = { static struct adp5588_gpio_platform_data adp5588_gpio_data = {
.gpio_start = 50, .gpio_start = 50,
.pullup_dis_mask = 0, .pullup_dis_mask = 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment