diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2009-06-30 10:57:22 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-09-16 21:28:57 -0400 |
commit | 204844ebd08cfb0c83689e55d6633dcd0230d36d (patch) | |
tree | 7d73b7ba2e4b91b3768aae0c23066c1f6f1c86dd /arch/blackfin/mach-bf527 | |
parent | 2f812c0bd5ee1d9c145fb1c3523ecdf45e05f8ce (diff) |
Blackfin: rename PCF8574 driver config
The "TWI_KEYPAD" driver was renamed to "INPUT_PCF8574", so update the
defines in the board resources accordingly.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-bf527')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezbrd.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index b09484f538f4..3a620666bb87 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -799,7 +799,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
799 | .type = "pcf8574_lcd", | 799 | .type = "pcf8574_lcd", |
800 | }, | 800 | }, |
801 | #endif | 801 | #endif |
802 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) | 802 | #if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE) |
803 | { | 803 | { |
804 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), | 804 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), |
805 | .type = "pcf8574_keypad", | 805 | .type = "pcf8574_keypad", |
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c index 2ad68cd10ae6..809c7907b6e3 100644 --- a/arch/blackfin/mach-bf527/boards/ezbrd.c +++ b/arch/blackfin/mach-bf527/boards/ezbrd.c | |||
@@ -596,7 +596,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
596 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 596 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
597 | }, | 597 | }, |
598 | #endif | 598 | #endif |
599 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) | 599 | #if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE) |
600 | { | 600 | { |
601 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), | 601 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), |
602 | .irq = IRQ_PF8, | 602 | .irq = IRQ_PF8, |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 75e563d3f9d4..b843d0e3f679 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -863,7 +863,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { | |||
863 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), | 863 | I2C_BOARD_INFO("pcf8574_lcd", 0x22), |
864 | }, | 864 | }, |
865 | #endif | 865 | #endif |
866 | #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE) | 866 | #if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE) |
867 | { | 867 | { |
868 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), | 868 | I2C_BOARD_INFO("pcf8574_keypad", 0x27), |
869 | .irq = IRQ_PF8, | 869 | .irq = IRQ_PF8, |