diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-02 14:11:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-02 14:23:57 +0200 |
| commit | 8e9ed8b02490fea577b1eb1704c05bf43c891ed7 (patch) | |
| tree | 3c0cc5dd498abcf0cc894e85509c131a0dde9a43 /arch/blackfin/mach-bf548/boards/ezkit.c | |
| parent | 716a42348cdaf04534b15fbdc9c83e25baebfed5 (diff) | |
| parent | 07903af152b0597d94e9b0030746b63c4664e787 (diff) | |
| download | talos-op-linux-8e9ed8b02490fea577b1eb1704c05bf43c891ed7.tar.gz talos-op-linux-8e9ed8b02490fea577b1eb1704c05bf43c891ed7.zip | |
Merge branch 'sched/urgent' into sched/core
Merge reason: avoid upcoming patch conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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[] = { #if !defined(CONFIG_BF542) /* The BF542 only has 1 TWI */ static struct i2c_board_info __initdata bfin_i2c_board_info1[] = { -#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE) +#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE) { I2C_BOARD_INFO("pcf8574_lcd", 0x22), }, |
