diff options
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-mx51/keypad.h | 10 | ||||
-rw-r--r-- | include/asm-arm/arch-mx51/mx51.h | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/include/asm-arm/arch-mx51/keypad.h b/include/asm-arm/arch-mx51/keypad.h index 5846364..1e67547 100644 --- a/include/asm-arm/arch-mx51/keypad.h +++ b/include/asm-arm/arch-mx51/keypad.h @@ -52,14 +52,4 @@ #define KEY_MENU 139 /* Menu (show menu) */ #define KEY_BACK 158 /* AC Back */ -#if defined(CONFIG_MX51_BBG) -#define TEST_HOME_KEY_DEPRESS(k, e) (((k) == (KEY_F1)) && (((e) == (KDepress)))) -#define TEST_POWER_KEY_DEPRESS(k, e) (((k) == (KEY_F3)) && (((e) == (KDepress)))) -#elif defined(CONFIG_MX51_3DS) -#define TEST_HOME_KEY_DEPRESS(k, e) (((k) == (KEY_MENU)) && (((e) == (KDepress)))) -#define TEST_POWER_KEY_DEPRESS(k, e) (((k) == (KEY_F2)) && (((e) == (KDepress)))) -#else -# error Undefined board type! -#endif - #endif diff --git a/include/asm-arm/arch-mx51/mx51.h b/include/asm-arm/arch-mx51/mx51.h index 11aba01..816e792 100644 --- a/include/asm-arm/arch-mx51/mx51.h +++ b/include/asm-arm/arch-mx51/mx51.h @@ -441,10 +441,11 @@ #ifndef __ASSEMBLER__ enum boot_device { - UNKNOWN_BOOT, - NAND_BOOT, + UNKNOWN_BOOT = -1, + NAND_BOOT = 0, SPI_NOR_BOOT, MMC_BOOT, + END_BOOT, }; enum mxc_clock { |