git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge...
[pandora-kernel.git]
/
drivers
/
watchdog
/
Makefile
diff --git
a/drivers/watchdog/Makefile
b/drivers/watchdog/Makefile
index
dd77665
..
20e44c4
100644
(file)
--- a/
drivers/watchdog/Makefile
+++ b/
drivers/watchdog/Makefile
@@
-106,7
+106,7
@@
obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
# M32R Architecture
# M68K Architecture
-obj-$(CONFIG_M54
8x_WATCHDOG) += m548
x_wdt.o
+obj-$(CONFIG_M54
xx_WATCHDOG) += m54x
x_wdt.o
# MIPS Architecture
obj-$(CONFIG_ATH79_WDT) += ath79_wdt.o