git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull fluff into release branch
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
drivers
/
Makefile
diff --git
a/arch/sh/drivers/Makefile
b/arch/sh/drivers/Makefile
index bf18dbfb6787db618d339e082b08bd0a8d6e2713..6cb92676c5fc4a51178a72524a61ee6d93ac7f11 100644
(file)
--- a/
arch/sh/drivers/Makefile
+++ b/
arch/sh/drivers/Makefile
@@
-6,3
+6,4
@@
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