diff --git a/[refs] b/[refs] index 70449e3f6631..57834884f51d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 887c8ec7219fc8eba78bb8f44a74c660934e9b98 +refs/heads/master: 1379f49ea91a28f5c023d041aab785c3de60c65d diff --git a/trunk/include/linux/mfd/stmpe.h b/trunk/include/linux/mfd/stmpe.h index 8516fd1eaabc..f8d5b4d5843f 100644 --- a/trunk/include/linux/mfd/stmpe.h +++ b/trunk/include/linux/mfd/stmpe.h @@ -117,7 +117,7 @@ struct matrix_keymap_data; * @no_autorepeat: disable key autorepeat */ struct stmpe_keypad_platform_data { - struct matrix_keymap_data *keymap_data; + const struct matrix_keymap_data *keymap_data; unsigned int debounce_ms; unsigned int scan_count; bool no_autorepeat;