From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Jun 2005 13:41:21 +0000 (-0700)
Subject: ARM: OMAP: Manually merged drivers/char/watchdog/Makefile
X-Git-Tag: v2.6.13-omap1~103
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7950073d43120a4b82b261e2a990e8760bedc628;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Manually merged drivers/char/watchdog/Makefile

Manually merged drivers/char/watchdog/Makefile
---

diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index 568572162e4..95e7f757126 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
 obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
 obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
 obj-$(CONFIG_OMAP16XX_WATCHDOG) += omap1610_wdt.o
 
 # Only one watchdog can succeed. We probe the hardware watchdog