From 29c571d69686b509f22e4338743626ee1325e2e1 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Mon, 19 Dec 2011 11:22:36 -0500 Subject: [PATCH] --- yaml --- r: 277049 b: refs/heads/master c: bb558dac6776386a4d6994540a009231dcf53ee1 h: refs/heads/master i: 277047: d15a7ef21bab3ca95c80684a0b5db929a97b7a08 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/sp805_wdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1cdbd267edb8..08d985742a40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 452190cb0526e9cc11b0998a600411cb9c7cd684 +refs/heads/master: bb558dac6776386a4d6994540a009231dcf53ee1 diff --git a/trunk/drivers/watchdog/sp805_wdt.c b/trunk/drivers/watchdog/sp805_wdt.c index cc2cfbe33b30..bfaf9bb1ee0d 100644 --- a/trunk/drivers/watchdog/sp805_wdt.c +++ b/trunk/drivers/watchdog/sp805_wdt.c @@ -351,7 +351,7 @@ static int __devexit sp805_wdt_remove(struct amba_device *adev) return 0; } -static struct amba_id sp805_wdt_ids[] __initdata = { +static struct amba_id sp805_wdt_ids[] = { { .id = 0x00141805, .mask = 0x00ffffff,