diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2007-07-29 14:46:50 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2007-07-29 14:58:39 -0400 |
commit | 647e50f38345525d8261c295a0d0629dcea23a9b (patch) | |
tree | 1bf37cb38df1ee3d3fe4accb665c521674dd27c3 /drivers | |
parent | 286201dcabf7311d2e22a95829ba40744b15c81d (diff) |
[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')
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/char/Makefile | 1 |
2 files changed, 1 insertions, 1 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/ | |||
66 | obj-$(CONFIG_W1) += w1/ | 66 | obj-$(CONFIG_W1) += w1/ |
67 | obj-$(CONFIG_POWER_SUPPLY) += power/ | 67 | obj-$(CONFIG_POWER_SUPPLY) += power/ |
68 | obj-$(CONFIG_HWMON) += hwmon/ | 68 | obj-$(CONFIG_HWMON) += hwmon/ |
69 | obj-$(CONFIG_WATCHDOG) += char/watchdog/ | ||
69 | obj-$(CONFIG_PHONE) += telephony/ | 70 | obj-$(CONFIG_PHONE) += telephony/ |
70 | obj-$(CONFIG_MD) += md/ | 71 | obj-$(CONFIG_MD) += md/ |
71 | obj-$(CONFIG_BT) += bluetooth/ | 72 | obj-$(CONFIG_BT) += bluetooth/ |
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 8fecaf4010b1..2bc3a55ee407 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile | |||
@@ -97,7 +97,6 @@ obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o | |||
97 | obj-$(CONFIG_GPIO_TB0219) += tb0219.o | 97 | obj-$(CONFIG_GPIO_TB0219) += tb0219.o |
98 | obj-$(CONFIG_TELCLOCK) += tlclk.o | 98 | obj-$(CONFIG_TELCLOCK) += tlclk.o |
99 | 99 | ||
100 | obj-$(CONFIG_WATCHDOG) += watchdog/ | ||
101 | obj-$(CONFIG_MWAVE) += mwave/ | 100 | obj-$(CONFIG_MWAVE) += mwave/ |
102 | obj-$(CONFIG_AGP) += agp/ | 101 | obj-$(CONFIG_AGP) += agp/ |
103 | obj-$(CONFIG_DRM) += drm/ | 102 | obj-$(CONFIG_DRM) += drm/ |