diff --git a/Makefile b/Makefile
index f967226538903491c6a5cc96705337afbdb35348..6036dfb1ca5143d4ef2036bc0834d2adfd2cfae6 100644
--- a/Makefile
+++ b/Makefile
@@ -115,6 +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-$(CONFIG_SSI) += ssi.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
@@ -122,7 +123,7 @@ obj-y += bt-hci-csr.o
 obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
 obj-y += qemu-char.o aio.o net-checksum.o savevm.o
 obj-y += msmouse.o ps2.o
-obj-y += qdev.o qdev-properties.o ssi.o
+obj-y += qdev.o qdev-properties.o
 obj-y += qint.o qstring.o qdict.o qemu-config.o
 
 obj-$(CONFIG_BRLAPI) += baum.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 615288e2f723fcbc358f15414c169316da5becb2..a30393d5f657e4a0be830e368bb537d80f0a2aad 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -18,4 +18,5 @@ CONFIG_SD0303=y
 CONFIG_SD0323=y
 CONFIG_ADS7846=y
 CONFIG_MAX111X=y
+CONFIG_SSI=y
 CONFIG_SSI_SD=y