On Wed, Nov 20, 2013 at 08:12:37AM -0800, Markus Mayer wrote: > On 19 November 2013 11:07, Markus Mayer <markus.mayer@xxxxxxxxxx> wrote: > > This commit adds support for the watchdog timer used on the BCM281xx > > family of SoCs. > > > > Signed-off-by: Markus Mayer <markus.mayer@xxxxxxxxxx> > > Reviewed-by: Matt Porter <matt.porter@xxxxxxxxxx> > > Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx> > > --- > > drivers/watchdog/Kconfig | 22 +++ > > drivers/watchdog/Makefile | 1 + > > drivers/watchdog/bcm_kona_wdt.c | 365 +++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 388 insertions(+) > > create mode 100644 drivers/watchdog/bcm_kona_wdt.c > > > > [...] > > > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > > index 6c5bb27..7c860ca 100644 > > --- a/drivers/watchdog/Makefile > > +++ b/drivers/watchdog/Makefile > > @@ -55,6 +55,7 @@ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o > > obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o > > obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o > > obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o > > +obj-$(CONFIG_BCM_KONA_WDT) += bcm_kona_wdt.o > > > > # AVR32 Architecture > > obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o > > Just to let everyone know, due to the watchdog -> mainline merge a few > days ago, there's a trivial merge conflict now in the makefile. I'll > send out a re-based v5 of this patch once 3.13-rc1 has been tagged > (unless you would like a rebased-to-tip version before then). > Hi Markus, Yes, I noticed when I merged it into my watchdog-next branch. Reminds me ... v3 had a whitespace problem. I don't recall if you fixed that in v4. If you didn't, that might be a better reason to send v5. Take your patch and apply it with "git am" to find out. Thanks, Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
