diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-04-05 11:23:36 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-04-05 11:23:36 +0000 |
| commit | 4318fbda2a7ee51caafdc4eb1f8028a3f0605142 (patch) | |
| tree | cddb50a81d7d1a628cc400519162080c6d87868e /arch/m68k/amiga | |
| parent | 36ea5120664550fae6d31f1c6f695e4f8975cb06 (diff) | |
o Merge with Linux 2.1.91.
o First round of bugfixes for the SC/MC CPUs.
o FPU context switch fixes.
o Lazy context switches.
o Faster syscalls.
o Removed dead code.
o Shitloads of other things I forgot ...
Diffstat (limited to 'arch/m68k/amiga')
| -rw-r--r-- | arch/m68k/amiga/amiga_ksyms.c | 7 | ||||
| -rw-r--r-- | arch/m68k/amiga/zorro.c | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/m68k/amiga/amiga_ksyms.c b/arch/m68k/amiga/amiga_ksyms.c index 0eae9cfdb..9206b8e92 100644 --- a/arch/m68k/amiga/amiga_ksyms.c +++ b/arch/m68k/amiga/amiga_ksyms.c @@ -1,8 +1,8 @@ +#include <linux/config.h> #include <linux/module.h> #include <linux/types.h> #include <linux/zorro.h> #include <asm/amigahw.h> -#include <linux/pci.h> extern volatile u_short amiga_audio_min_period; extern u_short amiga_audio_period; @@ -17,6 +17,7 @@ EXPORT_SYMBOL(amiga_colorclock); EXPORT_SYMBOL(amiga_chip_alloc); EXPORT_SYMBOL(amiga_chip_free); EXPORT_SYMBOL(amiga_chip_avail); +EXPORT_SYMBOL(amiga_chip_size); EXPORT_SYMBOL(amiga_audio_period); EXPORT_SYMBOL(amiga_audio_min_period); @@ -25,7 +26,3 @@ EXPORT_SYMBOL(zorro_get_board); EXPORT_SYMBOL(zorro_config_board); EXPORT_SYMBOL(zorro_unconfig_board); EXPORT_SYMBOL(zorro_unused_z2ram); - -#if CONFIG_PCI -EXPORT_SYMBOL(pci_devices); -#endif diff --git a/arch/m68k/amiga/zorro.c b/arch/m68k/amiga/zorro.c index 4f007daf3..7f2cd8c47 100644 --- a/arch/m68k/amiga/zorro.c +++ b/arch/m68k/amiga/zorro.c @@ -651,7 +651,8 @@ BEGIN_PROD(APOLLO_3) END BEGIN_PROD(PETSOFF_LP) - PROD("Delfina", DSP, PETSOFF_LP_DELFINA) + PROD("Delfina", AUDIO, PETSOFF_LP_DELFINA) + PROD("Delfina Lite", AUDIO, PETSOFF_LP_DELFINA_LITE) END BEGIN_PROD(UWE_GERLACH) |