Diff
Modified: branches/2009R1/arch/blackfin/configs/BF537-STAMP_defconfig (6879 => 6880)
--- branches/2009R1/arch/blackfin/configs/BF537-STAMP_defconfig 2009-06-30 10:02:21 UTC (rev 6879)
+++ branches/2009R1/arch/blackfin/configs/BF537-STAMP_defconfig 2009-06-30 14:47:10 UTC (rev 6880)
@@ -1,7 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.28.10
-# Thu May 21 05:50:01 2009
#
# CONFIG_MMU is not set
# CONFIG_FPU is not set
@@ -693,15 +692,12 @@
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_UINPUT is not set
-CONFIG_CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PCF8574=m
#
# Hardware I/O ports
#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO is not set
# CONFIG_GAMEPORT is not set
#
Modified: branches/2009R1/arch/blackfin/configs/SRV1_defconfig (6879 => 6880)
--- branches/2009R1/arch/blackfin/configs/SRV1_defconfig 2009-06-30 10:02:21 UTC (rev 6879)
+++ branches/2009R1/arch/blackfin/configs/SRV1_defconfig 2009-06-30 14:47:10 UTC (rev 6880)
@@ -694,7 +694,7 @@
# CONFIG_INPUT_YEALINK is not set
CONFIG_INPUT_UINPUT=y
# CONFIG_BF53X_PFBUTTONS is not set
-# CONFIG_TWI_KEYPAD is not set
+# CONFIG_INPUT_PCF8574 is not set
#
# Hardware I/O ports
Modified: branches/2009R1/arch/blackfin/mach-bf518/boards/ezbrd.c (6879 => 6880)
--- branches/2009R1/arch/blackfin/mach-bf518/boards/ezbrd.c 2009-06-30 10:02:21 UTC (rev 6879)
+++ branches/2009R1/arch/blackfin/mach-bf518/boards/ezbrd.c 2009-06-30 14:47:10 UTC (rev 6880)
@@ -523,7 +523,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = IRQ_PF8,
Modified: branches/2009R1/arch/blackfin/mach-bf527/boards/cm_bf527.c (6879 => 6880)
--- branches/2009R1/arch/blackfin/mach-bf527/boards/cm_bf527.c 2009-06-30 10:02:21 UTC (rev 6879)
+++ branches/2009R1/arch/blackfin/mach-bf527/boards/cm_bf527.c 2009-06-30 14:47:10 UTC (rev 6880)
@@ -795,7 +795,7 @@
.type = "pcf8574_lcd",
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.type = "pcf8574_keypad",
Modified: branches/2009R1/arch/blackfin/mach-bf527/boards/ezbrd.c (6879 => 6880)
--- branches/2009R1/arch/blackfin/mach-bf527/boards/ezbrd.c 2009-06-30 10:02:21 UTC (rev 6879)
+++ branches/2009R1/arch/blackfin/mach-bf527/boards/ezbrd.c 2009-06-30 14:47:10 UTC (rev 6880)
@@ -591,7 +591,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = IRQ_PF8,
Modified: branches/2009R1/arch/blackfin/mach-bf527/boards/ezkit.c (6879 => 6880)
--- branches/2009R1/arch/blackfin/mach-bf527/boards/ezkit.c 2009-06-30 10:02:21 UTC (rev 6879)
+++ branches/2009R1/arch/blackfin/mach-bf527/boards/ezkit.c 2009-06-30 14:47:10 UTC (rev 6880)
@@ -859,7 +859,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = IRQ_PF8,
Modified: branches/2009R1/arch/blackfin/mach-bf533/boards/stamp.c (6879 => 6880)
--- branches/2009R1/arch/blackfin/mach-bf533/boards/stamp.c 2009-06-30 10:02:21 UTC (rev 6879)
+++ branches/2009R1/arch/blackfin/mach-bf533/boards/stamp.c 2009-06-30 14:47:10 UTC (rev 6880)
@@ -453,7 +453,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = 39,
Modified: branches/2009R1/arch/blackfin/mach-bf537/boards/stamp.c (6879 => 6880)
--- branches/2009R1/arch/blackfin/mach-bf537/boards/stamp.c 2009-06-30 10:02:21 UTC (rev 6879)
+++ branches/2009R1/arch/blackfin/mach-bf537/boards/stamp.c 2009-06-30 14:47:10 UTC (rev 6880)
@@ -1285,7 +1285,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = IRQ_PG6,
Modified: branches/2009R1/arch/blackfin/mach-bf548/boards/ezkit.c (6879 => 6880)
--- branches/2009R1/arch/blackfin/mach-bf548/boards/ezkit.c 2009-06-30 10:02:21 UTC (rev 6879)
+++ branches/2009R1/arch/blackfin/mach-bf548/boards/ezkit.c 2009-06-30 14:47:10 UTC (rev 6880)
@@ -791,7 +791,7 @@
I2C_BOARD_INFO("pcf8574_lcd", 0x22),
},
#endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
{
I2C_BOARD_INFO("pcf8574_keypad", 0x27),
.irq = 212,
