diff --git a/Kconfig.bcm_kf b/Kconfig.bcm_kf
index f80fc2fc0e2a9ae83de6de06c1a3c3fd6c4bb55e..58f3b7785f9f999b6a0217c6ebd185e8058c2562 100644
--- a/Kconfig.bcm_kf
+++ b/Kconfig.bcm_kf
@@ -4,486 +4,486 @@
 
 
 config BCM_KF_MISC_MAKEFILE:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MIPS_BCM963XX:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MIPS_BCM9685XX:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_ARM_BCM963XX:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_LINKER_WORKAROUND:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_KERN_WARNING:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_FIXADDR_TOP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_NBUFF:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_BLOG:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_VLANCTL_BIND:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_WANDEV:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_FAP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_CSUM_UNALIGNED:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_THREAD_SIZE_FIX:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_TSTAMP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_UNALIGNED_EXCEPTION:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MIPS_IOPORT_BASE:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_SHOW_RAW_BACKTRACE:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_DCACHE_SHARED:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_CPU_DATA_CPUID:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_PCI_FIXUP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_SYSRQ_AUX_CHAR:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_CHAR_SYSRQ:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MTD_BCMNAND:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MTD_BCM963XX:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MTD_OOB_AUTO:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MTD_IOCTL_FIX:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_PPP:
-	bool
+	bool ""
 	default n
 
 config BCM_KF_PROC_BCM:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_IKOS:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_DSP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_LOG:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_TRACE_CUSTOM:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_CGROUP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_HARDIRQ_CYCLES:
-	bool
+	bool ""
 	default n
 
 config BCM_KF_CONSOLE_LOGLEVEL:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_SHOW_HEAP_STACK:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_BYPASS_SMP_WARNING:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_OOM_REBOOT:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_VMSCAN_OPT:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_CPP_SUPPORT:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_SKB_DEFINES:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_VLAN:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_IGMP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_IGMP_RATE_LIMIT:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MLD:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_NETDEV_PATH:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MISC_IOCTLS:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MISALIGN_MQS:
-	bool
+	bool ""
 	default n
 
 config BCM_KF_NETFILTER:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_ENET_SWITCH:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_NAND:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_FAIL_CONFIG_ON_EOF:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_RUNNER:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_WL:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_LINKWATCH_WQ:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_IP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_SPU:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_80211:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_SCHEDAUDIT:
-	bool
+	bool ""
 	default n
 
 config BCM_KF_BALOO:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_BUZZZ:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_BOUNCE:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_ATM_BACKEND:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_EXTRA_DEBUG:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_SPI:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MUTEX_FIX:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_POWER_SAVE:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_DSP_EXCEPT:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_UNI_UNI:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MODULE_OWNER:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_RCU_CONSTANT_BUG:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_JFFS:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_PROC_DEFAULT:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_ASSERT:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_EXTSTATS:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_USB_STORAGE:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_USBNET:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_FAP_GSO_LOOPBACK:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_PROTO_IPSEC:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_PROTO_ESP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_PRINTK_INT_ENABLED:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_LIMITED_IFINDEX:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_PMON:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_BRIDGE_PORT_ISOLATION:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_BRIDGE_STP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_STP_LOOP:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_BRIDGE_STATIC_FDB:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_BRIDGE_DYNAMIC_FDB:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_BRIDGE_MAC_FDB_LIMIT:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_IEEE1905:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_FBOND:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MCAST_RP_FILTER:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_XT_MATCH_LAYER7:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_XT_TARGET_DC:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_VLAN_AGGREGATION:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_ETHTOOL:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_DEBUGGING_DISABLED_FIX:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_CPU_DOWN_PREEMPT_ON:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_IPV6RD_SECURITY:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_DPI:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_ARM_ERRATA_798181:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_ARM_PLD:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MISC_3_4_CVE_PORTS:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MISC_BACKPORTS:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_SCHED_RT:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_SCHED_RT_SHARE:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MODINST_DIR:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_WLAN:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_ONDEMAND:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_EMMC:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_USB_HOSTS:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_SPDSVC:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_ANDROID:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_OCF:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_LEDS:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_BRIDGE_COUNTERS:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_MHI:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_PHONET:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_M2M_DMA:
-	bool
+	bool ""
 	default y
 
 config BCM_KF_RECVFILE:
-	bool
+	bool ""
 	default y