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-bf537 | |
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-bf537')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 447d6d40361b..2300ed4ec601 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -1068,7 +1068,6 @@ static struct adp5588_kpad_platform_data adp5588_kpad_data = { | |||
1068 | }; | 1068 | }; |
1069 | #endif | 1069 | #endif |
1070 | 1070 | ||
1071 | #ifdef CONFIG_I2C_BOARDINFO | ||
1072 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | 1071 | static struct i2c_board_info __initdata bfin_i2c_board_info[] = { |
1073 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) | 1072 | #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) |
1074 | { | 1073 | { |
@@ -1102,7 +1101,6 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
1102 | }, | 1101 | }, |
1103 | #endif | 1102 | #endif |
1104 | }; | 1103 | }; |
1105 | #endif | ||
1106 | 1104 | ||
1107 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) | 1105 | #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE) |
1108 | static struct platform_device bfin_sport0_uart_device = { | 1106 | static struct platform_device bfin_sport0_uart_device = { |
@@ -1284,12 +1282,8 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
1284 | static int __init stamp_init(void) | 1282 | static int __init stamp_init(void) |
1285 | { | 1283 | { |
1286 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 1284 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
1287 | |||
1288 | #ifdef CONFIG_I2C_BOARDINFO | ||
1289 | i2c_register_board_info(0, bfin_i2c_board_info, | 1285 | i2c_register_board_info(0, bfin_i2c_board_info, |
1290 | ARRAY_SIZE(bfin_i2c_board_info)); | 1286 | ARRAY_SIZE(bfin_i2c_board_info)); |
1291 | #endif | ||
1292 | |||
1293 | bfin_plat_nand_init(); | 1287 | bfin_plat_nand_init(); |
1294 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 1288 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
1295 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 1289 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |