Title: [6910] trunk/arch/blackfin: Bug [#5303] twi lcd fails to open lcd device

Diff

Modified: trunk/arch/blackfin/mach-bf518/boards/ezbrd.c (6909 => 6910)


--- trunk/arch/blackfin/mach-bf518/boards/ezbrd.c	2009-07-02 10:59:58 UTC (rev 6909)
+++ trunk/arch/blackfin/mach-bf518/boards/ezbrd.c	2009-07-02 11:00:38 UTC (rev 6910)
@@ -534,7 +534,7 @@
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#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),
 	},

Modified: trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c (6909 => 6910)


--- trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c	2009-07-02 10:59:58 UTC (rev 6909)
+++ trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c	2009-07-02 11:00:38 UTC (rev 6910)
@@ -793,7 +793,7 @@
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#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),
 		.type = "pcf8574_lcd",

Modified: trunk/arch/blackfin/mach-bf527/boards/ezbrd.c (6909 => 6910)


--- trunk/arch/blackfin/mach-bf527/boards/ezbrd.c	2009-07-02 10:59:58 UTC (rev 6909)
+++ trunk/arch/blackfin/mach-bf527/boards/ezbrd.c	2009-07-02 11:00:38 UTC (rev 6910)
@@ -591,7 +591,7 @@
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#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),
 	},

Modified: trunk/arch/blackfin/mach-bf527/boards/ezkit.c (6909 => 6910)


--- trunk/arch/blackfin/mach-bf527/boards/ezkit.c	2009-07-02 10:59:58 UTC (rev 6909)
+++ trunk/arch/blackfin/mach-bf527/boards/ezkit.c	2009-07-02 11:00:38 UTC (rev 6910)
@@ -858,7 +858,7 @@
 #endif
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#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),
 	},

Modified: trunk/arch/blackfin/mach-bf533/boards/stamp.c (6909 => 6910)


--- trunk/arch/blackfin/mach-bf533/boards/stamp.c	2009-07-02 10:59:58 UTC (rev 6909)
+++ trunk/arch/blackfin/mach-bf533/boards/stamp.c	2009-07-02 11:00:38 UTC (rev 6910)
@@ -453,7 +453,7 @@
 		.irq = 39,
 	},
 #endif
-#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),
 	},

Modified: trunk/arch/blackfin/mach-bf537/boards/stamp.c (6909 => 6910)


--- trunk/arch/blackfin/mach-bf537/boards/stamp.c	2009-07-02 10:59:58 UTC (rev 6909)
+++ trunk/arch/blackfin/mach-bf537/boards/stamp.c	2009-07-02 11:00:38 UTC (rev 6910)
@@ -1343,7 +1343,7 @@
 		.irq = IRQ_PF5,
 	},
 #endif
-#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),
 	},

Modified: trunk/arch/blackfin/mach-bf548/boards/ezkit.c (6909 => 6910)


--- trunk/arch/blackfin/mach-bf548/boards/ezkit.c	2009-07-02 10:59:58 UTC (rev 6909)
+++ trunk/arch/blackfin/mach-bf548/boards/ezkit.c	2009-07-02 11:00:38 UTC (rev 6910)
@@ -864,7 +864,7 @@
 
 #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),
 	},
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to