summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/time_32.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-20 19:59:54 (GMT)
committerDavid S. Miller <davem@davemloft.net>2011-05-20 19:59:54 (GMT)
commit9fafbd806198eb690c9a9f9fe35a879db93a1b8d (patch)
treea555f39102d51151d7f8461a4f575468cd52f33c /arch/sparc/kernel/time_32.c
parentd81f087f1f1c1aacdb4f17224a554237285ddd11 (diff)
parent21dccddf45aae2d9f973696ce06115da0d1012b6 (diff)
downloadlinux-9fafbd806198eb690c9a9f9fe35a879db93a1b8d.tar.xz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc/kernel/time_32.c')
-rw-r--r--arch/sparc/kernel/time_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c
index b618403..1060e06 100644
--- a/arch/sparc/kernel/time_32.c
+++ b/arch/sparc/kernel/time_32.c
@@ -168,7 +168,7 @@ static int __devinit clock_probe(struct platform_device *op)
return 0;
}
-static struct of_device_id __initdata clock_match[] = {
+static struct of_device_id clock_match[] = {
{
.name = "eeprom",
},