diff --git a/Makefile b/Makefile
index 8c0a1f19b0ee53e91b604afaa1cb84e6245f31e9..55380f17952e8843db3f952cc21bb2eb727c6c12 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,8 @@ obj-y += readline.o console.o
 obj-y += tcg-runtime.o host-utils.o
 obj-y += irq.o ioport.o
 obj-$(CONFIG_PTIMER) += ptimer.o
-obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
+obj-$(CONFIG_MAX7310) += max7310.o
+obj-y += i2c.o smbus.o smbus_eeprom.o max111x.o wm8750.o
 obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o
 obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o
 obj-y += scsi-disk.o cdrom.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 52b2dfa10b7a1ee1e806c50a7d24fade466673f4..88232c7e108707e698468b8ef4046483544126a2 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -7,3 +7,4 @@ CONFIG_NAND=y
 CONFIG_ECC=y
 CONFIG_PTIMER=y
 CONFIG_SD=y
+CONFIG_MAX7310=y