diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-06 13:07:32 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-06 13:07:32 -0400 |
| commit | 70f05366b71c51c35c25c0b76b4318fbc26c975a (patch) | |
| tree | d31230b93ba7df50d87eb11b1dba091641a9b89e /arch/sparc64/kernel/prom.c | |
| parent | c0bc8721b8d0380ec69fa97578c91201201b05a9 (diff) | |
| parent | 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/sparc64/kernel/prom.c')
| -rw-r--r-- | arch/sparc64/kernel/prom.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c index fa484d4f241..99daeee4209 100644 --- a/arch/sparc64/kernel/prom.c +++ b/arch/sparc64/kernel/prom.c @@ -1032,7 +1032,9 @@ static void sun4v_vdev_irq_trans_init(struct device_node *dp) static void irq_trans_init(struct device_node *dp) { const char *model; +#ifdef CONFIG_PCI int i; +#endif model = of_get_property(dp, "model", NULL); if (!model) |