diff --git a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c index de713fae2..617c755eb 100644 --- a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c +++ b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/board-qi_lb60.c @@ -94,12 +94,12 @@ static struct mtd_partition qi_lb60_partitions_2gb[] = { }, { .name = "NAND ROOTFS partition", .offset = 8 * 0x100000, - .size = 256 * 0x100000, + .size = 256 * 0x100000, }, - { .name = "NAND DATA partition", - .offset = 264 * 0x100000, - .size = 1784 * 0x100000, - }, + { .name = "NAND DATA partition", + .offset = 264 * 0x100000, + .size = 1784 * 0x100000, + }, }; static void qi_lb60_nand_ident(struct platform_device *pdev, @@ -124,11 +124,6 @@ static struct jz_nand_platform_data qi_lb60_nand_pdata = { }; /* Keyboard*/ - -/* #define KEEP_UART_ALIVE - * don't define this. the keyboard and keyboard both work - */ - #define KEY_QI_VOLUP KEY_F11 #define KEY_QI_VOLDOWN KEY_F12 #define KEY_QI_QI KEY_F13 @@ -193,12 +188,9 @@ static const uint32_t qi_lb60_keymap[] = { KEY(6, 5, KEY_QI_VOLDOWN), /* S55 */ KEY(6, 6, KEY_DOWN), /* S56 */ KEY(6, 7, KEY_RIGHT), /* S57 */ - -#ifndef KEEP_UART_ALIVE KEY(7, 0, KEY_LEFTSHIFT), /* S58 */ KEY(7, 1, KEY_LEFTALT), /* S59 */ KEY(7, 2, KEY_QI_FN), /* S60 */ -#endif }; static const struct matrix_keymap_data qi_lb60_keymap_data = { @@ -211,10 +203,7 @@ static const unsigned int qi_lb60_keypad_cols[] = { }; static const unsigned int qi_lb60_keypad_rows[] = { - 114, 115, 116, 117, 118, 119, 120, -#ifndef KEEP_UART_ALIVE - 122, -#endif + 114, 115, 116, 117, 118, 119, 120, 122, }; static struct matrix_keypad_platform_data qi_lb60_pdata = {