diff --git a/target/linux/cobalt/config-3.3 b/target/linux/cobalt/config-3.3
index ccc5839513..315ef15865 100644
--- a/target/linux/cobalt/config-3.3
+++ b/target/linux/cobalt/config-3.3
@@ -85,10 +85,6 @@ CONFIG_HZ=250
 CONFIG_HZ_250=y
 CONFIG_I8253=y
 CONFIG_I8259=y
-CONFIG_INPUT=y
-CONFIG_INPUT_COBALT_BTNS=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_POLLDEV=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_MULTICAST is not set
 CONFIG_IRQ_CPU=y
diff --git a/target/linux/cobalt/modules.mk b/target/linux/cobalt/modules.mk
index fcba757312..79cef87cac 100644
--- a/target/linux/cobalt/modules.mk
+++ b/target/linux/cobalt/modules.mk
@@ -19,3 +19,18 @@ define KernelPackage/fb-cobalt/descriptione
 endef
 
 $(eval $(call KernelPackage,fb-cobalt))
+
+define KernelPackage/cobalt-btns
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Cobalt buttons support
+  DEPENDS:=@TARGET_cobalt +kmod-input-evdev +kmod-input-polldev
+  KCONFIG:=CONFIG_INPUT_COBALT_BTNS
+  FILES:=$(LINUX_DIR)/drivers/input/misc/cobalt_btns.ko
+  AUTOLOAD:=$(call AutoLoad,62,cobalt_btns)
+endef
+
+define KernelPackage/cobalt-btns/description
+  Kernel module for the Cobalt Microservers buttons
+endef
+
+$(eval $(call KernelPackage,cobalt-btns))