diff --git a/Makefile b/Makefile
index f3952116b9..dfc0b73102 100644
--- a/Makefile
+++ b/Makefile
@@ -104,8 +104,9 @@ obj-$(CONFIG_TWL92230) += twl92230.o
 obj-$(CONFIG_TSC2005) += tsc2005.o
 obj-$(CONFIG_LM832X) += lm832x.o
 obj-$(CONFIG_TMP105) += tmp105.o
+obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
 obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o
-obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o
+obj-y += ssd0303.o ssd0323.o ads7846.o
 obj-y += eeprom93xx.o
 obj-y += scsi-disk.o cdrom.o
 obj-y += scsi-generic.o scsi-bus.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 6cbd8a3f0c..dddc2a6289 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -13,3 +13,4 @@ CONFIG_TWL92230=y
 CONFIG_TSC2005=y
 CONFIG_LM832X=y
 CONFIG_TMP105=y
+CONFIG_STELLARIS_INPUT=y