From f61054f417e37649860f11f3baa0cf0291c64038 Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Sun, 29 Jul 2007 18:46:50 +0000 Subject: [PATCH] --- yaml --- r: 63527 b: refs/heads/master c: 647e50f38345525d8261c295a0d0629dcea23a9b h: refs/heads/master i: 63525: c492221cdc013c4c437ba53e7b31756d1c976081 63523: f6721c7bdd3a08f3190ec1a3f0abb81f55f533bc 63519: 9317665f5153603ddce9c1a7787ac740d6dcf756 v: v3 --- [refs] | 2 +- trunk/drivers/Makefile | 1 + trunk/drivers/char/Makefile | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f20c46a244ca..5a46bc8bdb25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 286201dcabf7311d2e22a95829ba40744b15c81d +refs/heads/master: 647e50f38345525d8261c295a0d0629dcea23a9b diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile index a9e4c5f922a0..f0878b2ec55e 100644 --- a/trunk/drivers/Makefile +++ b/trunk/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/ diff --git a/trunk/drivers/char/Makefile b/trunk/drivers/char/Makefile index 8fecaf4010b1..2bc3a55ee407 100644 --- a/trunk/drivers/char/Makefile +++ b/trunk/drivers/char/Makefile @@ -97,7 +97,6 @@ obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o obj-$(CONFIG_GPIO_TB0219) += tb0219.o obj-$(CONFIG_TELCLOCK) += tlclk.o -obj-$(CONFIG_WATCHDOG) += watchdog/ obj-$(CONFIG_MWAVE) += mwave/ obj-$(CONFIG_AGP) += agp/ obj-$(CONFIG_DRM) += drm/