diff --git a/target/linux/kirkwood/config-default b/target/linux/kirkwood/config-default
index aab58c03b..3d345a5a7 100644
--- a/target/linux/kirkwood/config-default
+++ b/target/linux/kirkwood/config-default
@@ -19,8 +19,8 @@ CONFIG_ARM=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
 # CONFIG_ARM_THUMB is not set
 # CONFIG_ARPD is not set
-CONFIG_ATA=m
 CONFIG_BITREVERSE=y
+CONFIG_BLK_DEV_SD=y
 CONFIG_CACHE_FEROCEON_L2=y
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 CONFIG_CMDLINE="rootdelay=1 root=/dev/mmcblk0p1 noinitrd console=ttyS0,115200"
@@ -41,14 +41,11 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEVPORT=y
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
+# CONFIG_DLCI is not set
 # CONFIG_DM9000 is not set
 CONFIG_DNOTIFY=y
-# CONFIG_DSCC4 is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
-# CONFIG_FARSYNC is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y
@@ -78,11 +75,6 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_HAVE_PROC_CPU=y
-CONFIG_HDLC=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-CONFIG_HDLC_RAW=m
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_RANDOM=y
@@ -138,11 +130,10 @@ CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
 CONFIG_NET_DSA_TAG_DSA=y
 # CONFIG_NET_DSA_TAG_EDSA is not set
 # CONFIG_NET_DSA_TAG_TRAILER is not set
-CONFIG_NLS=m
+CONFIG_NLS=y
 CONFIG_OUTER_CACHE=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PATA_ARTOP=m
 CONFIG_PCI=y
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PHYLIB=y
@@ -150,22 +141,19 @@ CONFIG_PLAT_ORION=y
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_MV=y
-CONFIG_SATA_PMP=y
-CONFIG_SCSI=m
-CONFIG_SCSI_MOD=m
+CONFIG_SCSI=y
+CONFIG_SCSI_MOD=y
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_UID16=y
-CONFIG_USB=m
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=m
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_UHCI_HCD=m
+# CONFIG_USB_UHCI_HCD is not set
 CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VFP is not set
 CONFIG_VM_EVENT_COUNTERS=y