diff options
| author | Randy Dunlap <rdunlap@xenotime.net> | 2006-07-05 20:18:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-07-05 20:18:39 -0700 |
| commit | 7233589d77fdb593b482a8b7ee867e901f54b593 (patch) | |
| tree | dda022429dd1f8f74a53bc97b4f2ffad89d7a379 /arch/sparc64 | |
| parent | e340221acda6bc0bf05a0ff6e6114902c4307670 (diff) | |
| download | op-kernel-dev-7233589d77fdb593b482a8b7ee867e901f54b593.zip op-kernel-dev-7233589d77fdb593b482a8b7ee867e901f54b593.tar.gz | |
[SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
| -rw-r--r-- | arch/sparc64/kernel/prom.c | 2 | ||||
| -rw-r--r-- | arch/sparc64/kernel/time.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c index fa484d4..99daeee 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) diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index 8dcbfbf..b43de64 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c @@ -788,12 +788,15 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id if (!regs) return -ENOMEM; +#ifdef CONFIG_PCI if (!strcmp(model, "ds1287") || !strcmp(model, "m5819") || !strcmp(model, "m5819p") || !strcmp(model, "m5823")) { ds1287_regs = (unsigned long) regs; - } else if (model[5] == '0' && model[6] == '2') { + } else +#endif + if (model[5] == '0' && model[6] == '2') { mstk48t02_regs = regs; } else if(model[5] == '0' && model[6] == '8') { mstk48t08_regs = regs; |
