diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /arch/ia64/kernel/pci.c | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'arch/ia64/kernel/pci.c')
| -rw-r--r-- | arch/ia64/kernel/pci.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/ia64/kernel/pci.c b/arch/ia64/kernel/pci.c index 3bceeed8e..4acc7f041 100644 --- a/arch/ia64/kernel/pci.c +++ b/arch/ia64/kernel/pci.c @@ -226,14 +226,3 @@ void pcibios_align_resource (void *data, struct resource *res, unsigned long size) { } - -#if 0 /*def CONFIG_PROC_FS*/ -/* - * This is an ugly hack to get a (weak) unresolved reference to something that is - * in drivers/pci/proc.c. Without this, the file does not get linked in at all - * (I suspect the reason this isn't needed on Linux/x86 is that most people compile - * with module support, in which case the EXPORT_SYMBOL() stuff will ensure the - * code gets linked in. Sigh... --davidm 99/12/20. - */ -asm ("data8 proc_bus_pci_add"); -#endif |