summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorWim Van Sebroeck2007-07-29 20:46:50 +0200
committerWim Van Sebroeck2007-07-29 20:58:39 +0200
commit647e50f38345525d8261c295a0d0629dcea23a9b (patch)
tree1bf37cb38df1ee3d3fe4accb665c521674dd27c3 /drivers/Makefile
parent[WATCHDOG] ICH9 support for iTCO_wdt (diff)
downloadkernel-qcow2-linux-647e50f38345525d8261c295a0d0629dcea23a9b.tar.gz
kernel-qcow2-linux-647e50f38345525d8261c295a0d0629dcea23a9b.tar.xz
kernel-qcow2-linux-647e50f38345525d8261c295a0d0629dcea23a9b.zip
[WATCHDOG] Fix pcwd_init_module crash
Fix for the problem detected by Ingo Molnar: enabling CONFIG_PCWATCHDOG=y crashes bzImage bootup. The reason for this can be found in drivers/makefile We first do: obj-y += char/ and later we do: obj-y += base/ block/ misc/ mfd/ net/ media/ So if we put a platform or isa or usb bus driver in char/watchdog (which is called from the Makefile in drivers/char/Makefile) then we didn't have the different device drivers initialized yet (they are in drivers/base and drivers/usb and ...) This fix makes sure that we compile the watchdog drivers after drivers/base, drivers/misc, drivers/pci and drivers/usb. We also do the compile after hwmon because in the future the watchdog temperature support will use the hwmon system. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index a9e4c5f922a0..f0878b2ec55e 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -66,6 +66,7 @@ obj-y += i2c/
obj-$(CONFIG_W1) += w1/
obj-$(CONFIG_POWER_SUPPLY) += power/
obj-$(CONFIG_HWMON) += hwmon/
+obj-$(CONFIG_WATCHDOG) += char/watchdog/
obj-$(CONFIG_PHONE) += telephony/
obj-$(CONFIG_MD) += md/
obj-$(CONFIG_BT) += bluetooth/