diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-09 09:34:45 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-09 09:34:45 -0600 |
| commit | d41d4113f49e16bfab02eff0248282200be21807 (patch) | |
| tree | ae84803c22a09f138023ef62de73712f324bc62d /arch/blackfin/mach-bf533/boards/blackstamp.c | |
| parent | b58a4cc51f4f569c6a86979890f9b237a504ab6b (diff) | |
| parent | d5b562330ec766292a3ac54ae5e0673610bd5b3d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/blackfin/mach-bf533/boards/blackstamp.c')
| -rw-r--r-- | arch/blackfin/mach-bf533/boards/blackstamp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf533/boards/blackstamp.c b/arch/blackfin/mach-bf533/boards/blackstamp.c index 6ee607c259a..015c18f85e7 100644 --- a/arch/blackfin/mach-bf533/boards/blackstamp.c +++ b/arch/blackfin/mach-bf533/boards/blackstamp.c @@ -309,10 +309,8 @@ static struct platform_device i2c_gpio_device = { }; #endif -#ifdef CONFIG_I2C_BOARDINFO static struct i2c_board_info __initdata bfin_i2c_board_info[] = { }; -#endif static const unsigned int cclk_vlev_datasheet[] = { @@ -390,10 +388,8 @@ static int __init blackstamp_init(void) printk(KERN_INFO "%s(): registering device resources\n", __func__); -#ifdef CONFIG_I2C_BOARDINFO i2c_register_board_info(0, bfin_i2c_board_info, ARRAY_SIZE(bfin_i2c_board_info)); -#endif ret = platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); if (ret < 0) |