浏览代码

Blackfin: fix incomplete renaming of the bfin-twi-lcd driver

The sed used to rename the bfin-twi-lcd only replaced the first instance
rather than all which led to the resources not being enabled when the
driver was built as a module.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Michael Hennerich 16 年之前
父节点
当前提交
ebd5833327

+ 1 - 1
arch/blackfin/mach-bf518/boards/ezbrd.c

@@ -534,7 +534,7 @@ static struct platform_device i2c_bfin_twi_device = {
 #endif
 #endif
 
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 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),
 		I2C_BOARD_INFO("pcf8574_lcd", 0x22),
 	},
 	},

+ 1 - 1
arch/blackfin/mach-bf527/boards/cm_bf527.c

@@ -793,7 +793,7 @@ static struct platform_device i2c_bfin_twi_device = {
 #endif
 #endif
 
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 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),
 		I2C_BOARD_INFO("pcf8574_lcd", 0x22),
 		.type = "pcf8574_lcd",
 		.type = "pcf8574_lcd",

+ 1 - 1
arch/blackfin/mach-bf527/boards/ezbrd.c

@@ -591,7 +591,7 @@ static struct platform_device i2c_bfin_twi_device = {
 #endif
 #endif
 
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 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),
 		I2C_BOARD_INFO("pcf8574_lcd", 0x22),
 	},
 	},

+ 1 - 1
arch/blackfin/mach-bf527/boards/ezkit.c

@@ -858,7 +858,7 @@ static struct platform_device i2c_bfin_twi_device = {
 #endif
 #endif
 
 
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 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),
 		I2C_BOARD_INFO("pcf8574_lcd", 0x22),
 	},
 	},

+ 1 - 1
arch/blackfin/mach-bf533/boards/stamp.c

@@ -453,7 +453,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 		.irq = 39,
 		.irq = 39,
 	},
 	},
 #endif
 #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),
 		I2C_BOARD_INFO("pcf8574_lcd", 0x22),
 	},
 	},

+ 1 - 1
arch/blackfin/mach-bf537/boards/stamp.c

@@ -1316,7 +1316,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 		.irq = IRQ_PF5,
 		.irq = IRQ_PF5,
 	},
 	},
 #endif
 #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),
 		I2C_BOARD_INFO("pcf8574_lcd", 0x22),
 	},
 	},

+ 1 - 1
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 */
 #if !defined(CONFIG_BF542)	/* The BF542 only has 1 TWI */
 static struct i2c_board_info __initdata bfin_i2c_board_info1[] = {
 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),
 		I2C_BOARD_INFO("pcf8574_lcd", 0x22),
 	},
 	},