diff options
Diffstat (limited to 'arch/sparc/kernel/pcic.c')
-rw-r--r-- | arch/sparc/kernel/pcic.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 9a0aa4ec5793..e5950b03df13 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
18 | #include <linux/jiffies.h> | 18 | #include <linux/jiffies.h> |
19 | 19 | ||
20 | #include <asm/ebus.h> | ||
21 | #include <asm/swift.h> /* for cache flushing. */ | 20 | #include <asm/swift.h> /* for cache flushing. */ |
22 | #include <asm/io.h> | 21 | #include <asm/io.h> |
23 | 22 | ||
@@ -429,7 +428,6 @@ static int __init pcic_init(void) | |||
429 | 428 | ||
430 | pcic_pbm_scan_bus(pcic); | 429 | pcic_pbm_scan_bus(pcic); |
431 | 430 | ||
432 | ebus_init(); | ||
433 | return 0; | 431 | return 0; |
434 | } | 432 | } |
435 | 433 | ||
@@ -492,10 +490,6 @@ static void pcic_map_pci_device(struct linux_pcic *pcic, | |||
492 | * do ioremap() before accessing PC-style I/O, | 490 | * do ioremap() before accessing PC-style I/O, |
493 | * we supply virtual, ready to access address. | 491 | * we supply virtual, ready to access address. |
494 | * | 492 | * |
495 | * Ebus devices do not come here even if | ||
496 | * CheerIO makes a similar conversion. | ||
497 | * See ebus.c for details. | ||
498 | * | ||
499 | * Note that request_region() | 493 | * Note that request_region() |
500 | * works for these devices. | 494 | * works for these devices. |
501 | * | 495 | * |
@@ -676,7 +670,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) | |||
676 | } | 670 | } |
677 | 671 | ||
678 | /* | 672 | /* |
679 | * pcic_pin_to_irq() is exported to ebus.c. | 673 | * pcic_pin_to_irq() is exported to bus probing code |
680 | */ | 674 | */ |
681 | unsigned int | 675 | unsigned int |
682 | pcic_pin_to_irq(unsigned int pin, const char *name) | 676 | pcic_pin_to_irq(unsigned int pin, const char *name) |