aboutsummaryrefslogtreecommitdiff
path: root/drivers/watchdog/sp805_wdt.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-01-02 18:56:49 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-02 18:56:49 -0500
commit455ffa607f0efa90c9fec99604553b7cdd5274b2 (patch)
tree6ff12c853b4a26612ceea8191a8eae29b130b670 /drivers/watchdog/sp805_wdt.c
parent3ab0b245aa550ea4670d096092ca8e8d5e14ac89 (diff)
parent115e8e705e4be071b9e06ff72578e3b603f2ba65 (diff)
downloadlinux-linaro-stable-455ffa607f0efa90c9fec99604553b7cdd5274b2.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/watchdog/sp805_wdt.c')
-rw-r--r--drivers/watchdog/sp805_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index cc2cfbe33b30..bfaf9bb1ee0d 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/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,