diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
| commit | ae38fd1e4c98588314a42097c5a5e77dcef23561 (patch) | |
| tree | f9f10c203bb9e5fbad4810d1f8774c08dfad20ff /drivers/zorro | |
| parent | 466a823d79f41d0713b272e48fd73e494b0588e0 (diff) | |
Merge with Linux 2.3.50.
Diffstat (limited to 'drivers/zorro')
| -rw-r--r-- | drivers/zorro/Makefile | 21 | ||||
| -rw-r--r-- | drivers/zorro/proc.c | 18 | ||||
| -rw-r--r-- | drivers/zorro/zorro.c | 12 | ||||
| -rw-r--r-- | drivers/zorro/zorrosyms.c | 20 |
4 files changed, 25 insertions, 46 deletions
diff --git a/drivers/zorro/Makefile b/drivers/zorro/Makefile index a8c66ed09..8e14649b2 100644 --- a/drivers/zorro/Makefile +++ b/drivers/zorro/Makefile @@ -9,24 +9,17 @@ # parent makefile. # -SUB_DIRS := -MOD_SUB_DIRS := $(SUB_DIRS) -ALL_SUB_DIRS := $(SUB_DIRS) - L_TARGET := zorro.a -# Nasty trick as nobody references zorrosyms.o, but we still want it linked. -ifeq ($(CONFIG_MODULES),y) -O_TARGET = zorro_syms.o -OX_OBJS = zorrosyms.o -O_OBJS = zorro.o names.o -L_OBJS := zorro_syms.o -else -L_OBJS := zorro.o names.o -endif +# Nasty trick as we need to link files with no references from the outside. +O_TARGET := zorro_core.o +L_OBJS := zorro_core.o +OX_OBJS := zorro.o ifdef CONFIG_PROC_FS -L_OBJS += proc.o +O_OBJS += proc.o endif +L_OBJS += names.o + include $(TOPDIR)/Rules.make diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c index 11b485b05..28b7c4272 100644 --- a/drivers/zorro/proc.c +++ b/drivers/zorro/proc.c @@ -120,14 +120,18 @@ static int __init zorro_proc_attach_device(u_int slot) return 0; } -void __init zorro_proc_init(void) +static int __init zorro_proc_init(void) { u_int slot; - if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO)) - return; - proc_bus_zorro_dir = proc_mkdir("zorro", proc_bus); - create_proc_info_entry("devices", 0, proc_bus_zorro_dir, get_zorro_dev_info); - for (slot = 0; slot < zorro_num_autocon; slot++) - zorro_proc_attach_device(slot); + if (MACH_IS_AMIGA && AMIGAHW_PRESENT(ZORRO)) { + proc_bus_zorro_dir = proc_mkdir("zorro", proc_bus); + create_proc_info_entry("devices", 0, proc_bus_zorro_dir, + get_zorro_dev_info); + for (slot = 0; slot < zorro_num_autocon; slot++) + zorro_proc_attach_device(slot); + } + return 0; } + +__initcall(zorro_proc_init); diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c index 227677c4d..b1d164d35 100644 --- a/drivers/zorro/zorro.c +++ b/drivers/zorro/zorro.c @@ -10,7 +10,7 @@ * for more details. */ -#include <linux/config.h> +#include <linux/module.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/init.h> @@ -75,6 +75,8 @@ struct zorro_dev *zorro_find_device(zorro_id id, struct zorro_dev *from) * Possible uses: * - z2ram device * - SCSI DMA bounce buffers + * + * FIXME: use the normal resource management */ u32 zorro_unused_z2ram[4] = { 0, 0, 0, 0 }; @@ -151,8 +153,8 @@ void __init zorro_init(void) if (m68k_memory[i].addr < 16*1024*1024) mark_region(m68k_memory[i].addr, m68k_memory[i].addr+m68k_memory[i].size, 0); - -#ifdef CONFIG_PROC_FS - zorro_proc_init(); -#endif } + + +EXPORT_SYMBOL(zorro_find_device); +EXPORT_SYMBOL(zorro_unused_z2ram); diff --git a/drivers/zorro/zorrosyms.c b/drivers/zorro/zorrosyms.c deleted file mode 100644 index d4ac5da87..000000000 --- a/drivers/zorro/zorrosyms.c +++ /dev/null @@ -1,20 +0,0 @@ -/* - * $Id: zorrosyms.c,v 1.1.2.1 1998/06/07 23:21:02 geert Exp $ - * - * Zorro Bus Services -- Exported Symbols - * - * Copyright (C) 1998-2000 Geert Uytterhoeven - */ - -#include <linux/module.h> -#include <linux/types.h> -#include <linux/zorro.h> - - /* Board configuration */ - -EXPORT_SYMBOL(zorro_find_device); - - /* Z2 memory */ - -EXPORT_SYMBOL(zorro_unused_z2ram); - |