m68k: kill arch/m68k/amiga/amiga_ksyms.c (8b169fa2) · Commits · 戴 / test

arch/m68k/amiga/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,6 @@
		# Makefile for Linux arch/m68k/amiga source directory
		#

		obj-y := config.o amiints.o cia.o chipram.o amisound.o amiga_ksyms.o
		obj-y := config.o amiints.o cia.o chipram.o amisound.o

		obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		#include <linux/module.h>
		#include <linux/types.h>
		#include <asm/ptrace.h>
		#include <asm/amigahw.h>
		#include <asm/amigaints.h>
		#include <asm/amipcmcia.h>

		extern volatile u_short amiga_audio_min_period;
		extern u_short amiga_audio_period;

		/*
		* Add things here when you find the need for it.
		*/
		EXPORT_SYMBOL(amiga_model);
		EXPORT_SYMBOL(amiga_chipset);
		EXPORT_SYMBOL(amiga_hw_present);
		EXPORT_SYMBOL(amiga_eclock);
		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);

		#ifdef CONFIG_AMIGA_PCMCIA
		EXPORT_SYMBOL(pcmcia_reset);
		EXPORT_SYMBOL(pcmcia_copy_tuple);
		EXPORT_SYMBOL(pcmcia_program_voltage);
		EXPORT_SYMBOL(pcmcia_access_speed);
		EXPORT_SYMBOL(pcmcia_write_enable);
		EXPORT_SYMBOL(pcmcia_write_disable);
		#endif

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include <linux/timer.h>
		#include <linux/init.h>
		#include <linux/string.h>
		#include <linux/module.h>

		#include <asm/system.h>
		#include <asm/amigahw.h>
		@@ -31,6 +32,7 @@ static const signed char sine_data[] = {
		*/

		volatile unsigned short amiga_audio_min_period = 124; /* Default for pre-OCS */
		EXPORT_SYMBOL(amiga_audio_min_period);

		#define MAX_PERIOD (65535)

		@@ -40,6 +42,7 @@ volatile unsigned short amiga_audio_min_period = 124; /* Default for pre-OCS */
		*/

		unsigned short amiga_audio_period = MAX_PERIOD;
		EXPORT_SYMBOL(amiga_audio_period);

		static unsigned long clock_constant;

+7 −0

Original line number	Diff line number	Diff line
		@@ -13,10 +13,13 @@
		#include <linux/ioport.h>
		#include <linux/slab.h>
		#include <linux/string.h>
		#include <linux/module.h>

		#include <asm/page.h>
		#include <asm/amigahw.h>

		unsigned long amiga_chip_size;
		EXPORT_SYMBOL(amiga_chip_size);

		static struct resource chipram_res = {
		.name = "Chip RAM", .start = CHIP_PHYSADDR
		@@ -67,6 +70,7 @@ void amiga_chip_alloc(unsigned long size, const char name)
		#endif
		return (void *)ZTWO_VADDR(res->start);
		}
		EXPORT_SYMBOL(amiga_chip_alloc);


		/*
		@@ -120,6 +124,7 @@ void amiga_chip_free(void *ptr)
		}
		printk("amiga_chip_free: trying to free nonexistent region at %p\n", ptr);
		}
		EXPORT_SYMBOL(amiga_chip_free);


		unsigned long amiga_chip_avail(void)
		@@ -129,3 +134,5 @@ unsigned long amiga_chip_avail(void)
		#endif
		return chipavail;
		}
		EXPORT_SYMBOL(amiga_chip_avail);

+12 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <linux/delay.h>
		#include <linux/interrupt.h>
		#include <linux/zorro.h>
		#include <linux/module.h>

		#include <asm/bootinfo.h>
		#include <asm/setup.h>
		@@ -36,13 +37,24 @@
		#include <asm/io.h>

		unsigned long amiga_model;
		EXPORT_SYMBOL(amiga_model);

		unsigned long amiga_eclock;
		EXPORT_SYMBOL(amiga_eclock);

		unsigned long amiga_masterclock;

		unsigned long amiga_colorclock;
		EXPORT_SYMBOL(amiga_colorclock);

		unsigned long amiga_chipset;
		EXPORT_SYMBOL(amiga_chipset);

		unsigned char amiga_vblank;
		unsigned char amiga_psfreq;

		struct amiga_hw_present amiga_hw_present;
		EXPORT_SYMBOL(amiga_hw_present);

		static char s_a500[] __initdata = "A500";
		static char s_a500p[] __initdata = "A500+";