diff --git a/Makefile.hw b/Makefile.hw
index 2b4ef03e0a..ba2d390515 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -31,7 +31,8 @@ obj-y += ne2000.o
 # SCSI layer
 obj-y += lsi53c895a.o esp.o
 
-obj-y += dma-helpers.o sysbus.o qdev-addr.o isa-bus.o
+obj-y += dma-helpers.o sysbus.o isa-bus.o
+obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o
 
 all: $(HWLIB)
 # Dummy command so that make thinks it has done something
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 2e0e621946..dc5183963b 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -1 +1,3 @@
 # Default configuration for sparc-softmmu
+
+CONFIG_QDEV_ADDR=y