diff --git a/Makefile b/Makefile
index b0c3027197fa9519199bb7d16734ecbe4a2895fb..f967226538903491c6a5cc96705337afbdb35348 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ obj-y += scsi-disk.o cdrom.o
 obj-y += scsi-generic.o scsi-bus.o
 obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
 obj-y += usb-serial.o usb-net.o usb-bus.o
-obj-y += ssi-sd.o
+obj-$(CONFIG_SSI_SD) += ssi-sd.o
 obj-$(CONFIG_SD) += sd.o
 obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
 obj-y += bt-hci-csr.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 486409d384ac6d8c30ea26b2b69a58f90be12d3e..615288e2f723fcbc358f15414c169316da5becb2 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -18,3 +18,4 @@ CONFIG_SD0303=y
 CONFIG_SD0323=y
 CONFIG_ADS7846=y
 CONFIG_MAX111X=y
+CONFIG_SSI_SD=y