diff options
| -rw-r--r-- | arch/arm/configs/cyanogenmod_d710_defconfig | 3 | ||||
| -rw-r--r-- | drivers/input/keyboard/cypress/cypress-touchkey.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/configs/cyanogenmod_d710_defconfig b/arch/arm/configs/cyanogenmod_d710_defconfig index 0b0133c..c76ef2c 100644 --- a/arch/arm/configs/cyanogenmod_d710_defconfig +++ b/arch/arm/configs/cyanogenmod_d710_defconfig @@ -523,6 +523,7 @@ CONFIG_BT_MGMT=y # CONFIG_QC_MODEM_MDM9X15 is not set # CONFIG_MDM_HSIC_PM is not set # CONFIG_EMI_ERROR_RECOVERY is not set +# CONFIG_SIM_DETECT is not set CONFIG_USB_CDFS_SUPPORT=y CONFIG_SAMSUNG_PRODUCT_SHIP=y # CONFIG_CORESIGHT_ETM is not set @@ -2746,6 +2747,7 @@ CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_XFS_FS is not set @@ -2835,6 +2837,7 @@ CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_CEPH_FS is not set CONFIG_CIFS=m CONFIG_CIFS_STATS=y diff --git a/drivers/input/keyboard/cypress/cypress-touchkey.c b/drivers/input/keyboard/cypress/cypress-touchkey.c index 6c248a4..d73ec15 100644 --- a/drivers/input/keyboard/cypress/cypress-touchkey.c +++ b/drivers/input/keyboard/cypress/cypress-touchkey.c @@ -64,7 +64,7 @@ static int touchkey_keycode[] = { 0, KEY_MENU, KEY_ENTER, KEY_BACK, KEY_END, #elif defined(TK_USE_4KEY_TYPE_NA) - KEY_SEARCH, KEY_BACK, KEY_HOMEPAGE, KEY_MENU, + KEY_SEARCH, KEY_BACK, KEY_HOME, KEY_MENU, #elif defined(TK_USE_2KEY_TYPE_M0) KEY_BACK, KEY_MENU, |