Merge branch 'x86/cpufeature' into irq/numa

[sfrench/cifs-2.6.git] / arch / sh / drivers / Makefile

diff --git a/arch/sh/drivers/Makefile b/arch/sh/drivers/Makefile
index bf18dbfb6787db618d339e082b08bd0a8d6e2713..e13f06bebd9221c9247d27754b0fcd396eb11e57 100644 (file)
--- a/arch/sh/drivers/Makefile
+++ b/arch/sh/drivers/Makefile
@@ -2,7 +2,9 @@
 # Makefile for the Linux SuperH-specific device drivers.
 #
 
+obj-y          += dma/
+
 obj-$(CONFIG_PCI)              += pci/
-obj-$(CONFIG_SH_DMA)           += dma/
 obj-$(CONFIG_SUPERHYWAY)       += superhyway/
 obj-$(CONFIG_PUSH_SWITCH)      += push-switch.o
+obj-$(CONFIG_HEARTBEAT)                += heartbeat.o