diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2009-02-04 03:49:45 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2009-02-04 03:49:45 -0500 |
commit | 2678479c33774f297ea2a5d232cad11c4d56ef6c (patch) | |
tree | e811e7dd790c2a30ce0f54868b878d930458d34e /arch/blackfin/mach-bf548 | |
parent | a6595bf04b9cc9a4997e6d849b62d69439dd1eff (diff) |
Blackfin arch: drop CONFIG_I2C_BOARDINFO ifdefs
Drop CONFIG_I2C_BOARDINFO ifdefs as the common i2c header handles this
already by stubbing things out
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/mach-bf548')
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 309c16014cae..096e661700a7 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -781,7 +781,6 @@ static struct platform_device i2c_bfin_twi1_device = { | |||
781 | #endif | 781 | #endif |
782 | #endif | 782 | #endif |
783 | 783 | ||
784 | #ifdef CONFIG_I2C_BOARDINFO | ||
785 | static struct i2c_board_info __initdata bfin_i2c_board_info0[] = { | 784 | static struct i2c_board_info __initdata bfin_i2c_board_info0[] = { |
786 | }; | 785 | }; |
787 | 786 | ||
@@ -800,7 +799,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info1[] = { | |||
800 | #endif | 799 | #endif |
801 | }; | 800 | }; |
802 | #endif | 801 | #endif |
803 | #endif | ||
804 | 802 | ||
805 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 803 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
806 | #include <linux/gpio_keys.h> | 804 | #include <linux/gpio_keys.h> |
@@ -956,14 +954,12 @@ static int __init ezkit_init(void) | |||
956 | { | 954 | { |
957 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 955 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
958 | 956 | ||
959 | #ifdef CONFIG_I2C_BOARDINFO | ||
960 | i2c_register_board_info(0, bfin_i2c_board_info0, | 957 | i2c_register_board_info(0, bfin_i2c_board_info0, |
961 | ARRAY_SIZE(bfin_i2c_board_info0)); | 958 | ARRAY_SIZE(bfin_i2c_board_info0)); |
962 | #if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */ | 959 | #if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */ |
963 | i2c_register_board_info(1, bfin_i2c_board_info1, | 960 | i2c_register_board_info(1, bfin_i2c_board_info1, |
964 | ARRAY_SIZE(bfin_i2c_board_info1)); | 961 | ARRAY_SIZE(bfin_i2c_board_info1)); |
965 | #endif | 962 | #endif |
966 | #endif | ||
967 | 963 | ||
968 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 964 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
969 | 965 | ||