diff options
| author | Sonic Zhang <sonic.zhang@analog.com> | 2009-12-22 04:47:04 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-03-09 00:30:47 -0500 |
| commit | 7a9cc48907e05e61033b953a3860e55703625950 (patch) | |
| tree | 66572c3350f4e9b17e1bcfa4c8b290253623ac8d | |
| parent | 01218654cd97a1e970034b1e080ec5459172c3f6 (diff) | |
| download | op-kernel-dev-7a9cc48907e05e61033b953a3860e55703625950.zip op-kernel-dev-7a9cc48907e05e61033b953a3860e55703625950.tar.gz | |
Blackfin: bf537-stamp: unify duplicated ADP5588 headers
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 5 |
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 3402236..27b9c9c 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c @@ -20,10 +20,11 @@ #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #include <linux/usb/isp1362.h> #endif +#include <linux/i2c.h> +#include <linux/i2c/adp5588.h> #include <linux/ata_platform.h> #include <linux/irq.h> #include <linux/interrupt.h> -#include <linux/i2c.h> #include <linux/usb/sl811.h> #include <linux/spi/mmc_spi.h> #include <linux/leds.h> @@ -1335,7 +1336,6 @@ static struct platform_device i2c_bfin_twi_device = { #endif #if defined(CONFIG_KEYBOARD_ADP5588) || defined(CONFIG_KEYBOARD_ADP5588_MODULE) -#include <linux/i2c/adp5588.h> static const unsigned short adp5588_keymap[ADP5588_KEYMAPSIZE] = { [0] = KEY_GRAVE, [1] = KEY_1, @@ -1532,7 +1532,6 @@ static struct adp5520_platform_data adp5520_pdev_data = { #endif #if defined(CONFIG_GPIO_ADP5588) || defined(CONFIG_GPIO_ADP5588_MODULE) -#include <linux/i2c/adp5588.h> static struct adp5588_gpio_platform_data adp5588_gpio_data = { .gpio_start = 50, .pullup_dis_mask = 0, |
