diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-04 07:58:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-04 07:58:28 -0400 |
| commit | e16852cfc5580b88cb327413ab8c89375f380592 (patch) | |
| tree | 67e7d5b84e2602986f2da689625e5a25d7af7bb4 /arch/blackfin/mach-bf548/boards/ezkit.c | |
| parent | bdff78707f3ce47e891f3201c9666122a70556ce (diff) | |
| parent | 74e7ff8c50b6b022e6ffaa736b16a4dc161d3eaf (diff) | |
Merge branch 'tracing/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/urgent
Diffstat (limited to 'arch/blackfin/mach-bf548/boards/ezkit.c')
| -rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 81f5b95cc361..dc0dd9b2bcef 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
| @@ -864,7 +864,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info0[] = { | |||
| 864 | 864 | ||
| 865 | #if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */ | 865 | #if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */ |
| 866 | static struct i2c_board_info __initdata bfin_i2c_board_info1[] = { | 866 | static struct i2c_board_info __initdata bfin_i2c_board_info1[] = { |
| 867 | #if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) | 867 | #if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE) |
| 868 | { | 868 | { |
| 869 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 869 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
| 870 | }, | 870 | }, |