diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 5398e5efd1..b7deabebcc 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -861,3 +861,20 @@ define KernelPackage/rtc-pcf8563/description
 endef
 
 $(eval $(call KernelPackage,rtc-pcf8563))
+
+
+define KernelPackage/n810bm
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Nokia N810 battery management driver
+  DEPENDS:=@TARGET_omap24xx
+  KCONFIG:=CONFIG_N810BM
+  FILES:=$(LINUX_DIR)/drivers/cbus/n810bm.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,01,n810bm)
+endef
+
+define KernelPackage/n810bm/description
+  Nokia N810 battery management driver.
+  Controls battery power management and battery charging.
+endef
+
+$(eval $(call KernelPackage,n810bm))
diff --git a/target/linux/omap24xx/config-2.6.37 b/target/linux/omap24xx/config-2.6.37
index f9b6cade0b..d9aade1b30 100644
--- a/target/linux/omap24xx/config-2.6.37
+++ b/target/linux/omap24xx/config-2.6.37
@@ -10,11 +10,9 @@
 CONFIG_AEABI=y
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_APM_EMULATION is not set
-# CONFIG_ARCH_CNS3XXX is not set
 CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-# CONFIG_ARCH_NUC93X is not set
 CONFIG_ARCH_OMAP=y
 # CONFIG_ARCH_OMAP1 is not set
 CONFIG_ARCH_OMAP2=y
@@ -26,16 +24,11 @@ CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 # CONFIG_ARCH_OMAP4 is not set
 CONFIG_ARCH_OMAP_OTG=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_S5P6442 is not set
-# CONFIG_ARCH_S5PC100 is not set
-# CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SHMOBILE is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
-# CONFIG_ARCH_VEXPRESS is not set
 CONFIG_ARM=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_ERRATA_411920=y
@@ -392,7 +385,7 @@ CONFIG_MTD_ONENAND_OTP=y
 # CONFIG_MTD_ROOTFS_ROOT_DEV is not set
 # CONFIG_MTD_ROOTFS_SPLIT is not set
 # CONFIG_MUSB_PIO_ONLY is not set
-CONFIG_N810BM=y
+# CONFIG_N810BM is not set
 CONFIG_NAMESPACES=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
@@ -440,7 +433,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PERF_USE_VMALLOC=y
-# CONFIG_PLAT_SPEAR is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_OPS=y