aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorSonic Zhang <sonic.zhang@analog.com>2009-12-21 23:47:04 -0500
committerMike Frysinger <vapier@gentoo.org>2010-03-09 00:30:47 -0500
commit7a9cc48907e05e61033b953a3860e55703625950 (patch)
tree66572c3350f4e9b17e1bcfa4c8b290253623ac8d /arch/blackfin
parent01218654cd97a1e970034b1e080ec5459172c3f6 (diff)
Blackfin: bf537-stamp: unify duplicated ADP5588 headers
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 34022367f518..27b9c9ce8d06 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -20,10 +20,11 @@
20#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) 20#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
21#include <linux/usb/isp1362.h> 21#include <linux/usb/isp1362.h>
22#endif 22#endif
23#include <linux/i2c.h>
24#include <linux/i2c/adp5588.h>
23#include <linux/ata_platform.h> 25#include <linux/ata_platform.h>
24#include <linux/irq.h> 26#include <linux/irq.h>
25#include <linux/interrupt.h> 27#include <linux/interrupt.h>
26#include <linux/i2c.h>
27#include <linux/usb/sl811.h> 28#include <linux/usb/sl811.h>
28#include <linux/spi/mmc_spi.h> 29#include <linux/spi/mmc_spi.h>
29#include <linux/leds.h> 30#include <linux/leds.h>
@@ -1335,7 +1336,6 @@ static struct platform_device i2c_bfin_twi_device = {
1335#endif 1336#endif
1336 1337
1337#if defined(CONFIG_KEYBOARD_ADP5588) || defined(CONFIG_KEYBOARD_ADP5588_MODULE) 1338#if defined(CONFIG_KEYBOARD_ADP5588) || defined(CONFIG_KEYBOARD_ADP5588_MODULE)
1338#include <linux/i2c/adp5588.h>
1339static const unsigned short adp5588_keymap[ADP5588_KEYMAPSIZE] = { 1339static const unsigned short adp5588_keymap[ADP5588_KEYMAPSIZE] = {
1340 [0] = KEY_GRAVE, 1340 [0] = KEY_GRAVE,
1341 [1] = KEY_1, 1341 [1] = KEY_1,
@@ -1532,7 +1532,6 @@ static struct adp5520_platform_data adp5520_pdev_data = {
1532#endif 1532#endif
1533 1533
1534#if defined(CONFIG_GPIO_ADP5588) || defined(CONFIG_GPIO_ADP5588_MODULE) 1534#if defined(CONFIG_GPIO_ADP5588) || defined(CONFIG_GPIO_ADP5588_MODULE)
1535#include <linux/i2c/adp5588.h>
1536static struct adp5588_gpio_platform_data adp5588_gpio_data = { 1535static struct adp5588_gpio_platform_data adp5588_gpio_data = {
1537 .gpio_start = 50, 1536 .gpio_start = 50,
1538 .pullup_dis_mask = 0, 1537 .pullup_dis_mask = 0,