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-bf527/boards/ezbrd.c | |
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-bf527/boards/ezbrd.c')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezbrd.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c index 521b25363815..f2b7a5482017 100644 --- a/arch/blackfin/mach-bf527/boards/ezbrd.c +++ b/arch/blackfin/mach-bf527/boards/ezbrd.c | |||
@@ -590,7 +590,6 @@ static struct platform_device i2c_bfin_twi_device = { | |||
590 | }; | 590 | }; |
591 | #endif | 591 | #endif |
592 | 592 | ||
593 | #ifdef CONFIG_I2C_BOARDINFO | ||
594 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 593 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
595 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 594 | #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) |
596 | { | 595 | { |
@@ -604,7 +603,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
604 | }, | 603 | }, |
605 | #endif | 604 | #endif |
606 | }; | 605 | }; |
607 | #endif | ||
608 | 606 | ||
609 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 607 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) |
610 | static struct platform_device bfin_sport0_uart_device = { | 608 | static struct platform_device bfin_sport0_uart_device = { |
@@ -767,12 +765,8 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
767 | static int __init stamp_init(void) | 765 | static int __init stamp_init(void) |
768 | { | 766 | { |
769 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 767 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
770 | |||
771 | #ifdef CONFIG_I2C_BOARDINFO | ||
772 | i2c_register_board_info(0, bfin_i2c_board_info, | 768 | i2c_register_board_info(0, bfin_i2c_board_info, |
773 | ARRAY_SIZE(bfin_i2c_board_info)); | 769 | ARRAY_SIZE(bfin_i2c_board_info)); |
774 | #endif | ||
775 | |||
776 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 770 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
777 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 771 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
778 | return 0; | 772 | return 0; |