Merge branch 'akpm' (patches from Andrew)

[mirror_ubuntu-artful-kernel.git] / drivers / input / rmi4 / rmi_bus.c

diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index e0b5a45e2b15cab20f8fca69d948ddccfd8540fe..ef8c747c35e76f0c77eaf86300f724e30cf6e0ff 100644 (file)
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -311,6 +311,9 @@ static struct rmi_function_handler *fn_handlers[] = {
 #ifdef CONFIG_RMI4_F30
        &rmi_f30_handler,
 #endif
+#ifdef CONFIG_RMI4_F54
+       &rmi_f54_handler,
+#endif
 };
 
 static void __rmi_unregister_function_handlers(int start_idx)