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/apc.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/apc.c')
| -rw-r--r-- | arch/sparc/kernel/apc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c index f679c57644d5..1e34f29e58bb 100644 --- a/arch/sparc/kernel/apc.c +++ b/arch/sparc/kernel/apc.c | |||
| @@ -165,7 +165,7 @@ static int __devinit apc_probe(struct platform_device *op) | |||
| 165 | return 0; | 165 | return 0; |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | static struct of_device_id __initdata apc_match[] = { | 168 | static struct of_device_id apc_match[] = { |
| 169 | { | 169 | { |
| 170 | .name = APC_OBPNAME, | 170 | .name = APC_OBPNAME, |
| 171 | }, | 171 | }, |