summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-06-22 23:36:11 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-06-22 23:36:11 +0000
commit7f0666a4296fd7d581ee9e21f550157f24c39998 (patch)
tree8e5cb888f07fd5b4445a85f012e37016be57a32f /arch
parent5205a16d8870cdd4cc524589de3e09ad176d129a (diff)
Fix modular IDE. Patch from Pavel.
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/mips_ksyms.c14
-rw-r--r--arch/mips/kernel/setup.c2
2 files changed, 10 insertions, 6 deletions
diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c
index 073205580..53b7a2931 100644
--- a/arch/mips/kernel/mips_ksyms.c
+++ b/arch/mips/kernel/mips_ksyms.c
@@ -1,12 +1,11 @@
-/* $Id: mips_ksyms.c,v 1.25 2000/02/24 00:12:40 ralf Exp $
- *
+/*
* Export MIPS-specific functions needed for loadable modules.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1996, 1997, 1998 by Ralf Baechle
+ * Copyright (C) 1996, 1997, 1998, 2000 by Ralf Baechle
*/
#include <linux/config.h>
#include <linux/module.h>
@@ -16,6 +15,7 @@
#include <asm/irq.h>
#include <linux/in6.h>
#include <linux/pci.h>
+#include <linux/ide.h>
#include <asm/checksum.h>
#include <asm/dma.h>
@@ -50,11 +50,12 @@ EXPORT_SYMBOL_NOVERS(memmove);
EXPORT_SYMBOL_NOVERS(strcat);
EXPORT_SYMBOL_NOVERS(strchr);
EXPORT_SYMBOL_NOVERS(strlen);
+EXPORT_SYMBOL_NOVERS(strpbrk);
EXPORT_SYMBOL_NOVERS(strncat);
EXPORT_SYMBOL_NOVERS(strnlen);
EXPORT_SYMBOL_NOVERS(strrchr);
+EXPORT_SYMBOL_NOVERS(strstr);
EXPORT_SYMBOL_NOVERS(strtok);
-EXPORT_SYMBOL_NOVERS(strpbrk);
EXPORT_SYMBOL(_clear_page);
EXPORT_SYMBOL(enable_irq);
@@ -131,6 +132,9 @@ EXPORT_SYMBOL(unregister_fpe);
EXPORT_SYMBOL(screen_info);
#endif
+#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
+EXPORT_SYMBOL(ide_ops);
+#endif
+
EXPORT_SYMBOL(get_wchan);
EXPORT_SYMBOL(irq_stat);
-
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index a2c325fd6..809d13a85 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -76,7 +76,7 @@ extern struct fd_ops no_fd_ops;
struct fd_ops *fd_ops;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
+#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
extern struct ide_ops no_ide_ops;
struct ide_ops *ide_ops;
#endif