diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-20 15:59:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-20 15:59:54 -0400 |
| commit | 9fafbd806198eb690c9a9f9fe35a879db93a1b8d (patch) | |
| tree | a555f39102d51151d7f8461a4f575468cd52f33c /arch/sparc/kernel/pmc.c | |
| parent | d81f087f1f1c1aacdb4f17224a554237285ddd11 (diff) | |
| parent | 21dccddf45aae2d9f973696ce06115da0d1012b6 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc/kernel/pmc.c')
| -rw-r--r-- | arch/sparc/kernel/pmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c index 93d7b4465f8d..6a585d393580 100644 --- a/arch/sparc/kernel/pmc.c +++ b/arch/sparc/kernel/pmc.c | |||
| @@ -69,7 +69,7 @@ static int __devinit pmc_probe(struct platform_device *op) | |||
| 69 | return 0; | 69 | return 0; |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | static struct of_device_id __initdata pmc_match[] = { | 72 | static struct of_device_id pmc_match[] = { |
| 73 | { | 73 | { |
| 74 | .name = PMC_OBPNAME, | 74 | .name = PMC_OBPNAME, |
| 75 | }, | 75 | }, |