Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83148
b: refs/heads/master
c: a3b2004
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Feb 5, 2008
1 parent cba6608 commit 621f994
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 37 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8b169fa2c942bc2a579da3f33986bd3fc48d9684
refs/heads/master: a3b2004a2671455ee7aef1d9aee5a24381999ddb
2 changes: 1 addition & 1 deletion trunk/arch/m68k/atari/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#

obj-y := config.o time.o debug.o ataints.o stdma.o \
atasound.o stram.o atari_ksyms.o
atasound.o stram.o

ifeq ($(CONFIG_PCI),y)
obj-$(CONFIG_HADES) += hades-pci.o
Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/m68k/atari/ataints.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <linux/kernel_stat.h>
#include <linux/init.h>
#include <linux/seq_file.h>
#include <linux/module.h>

#include <asm/system.h>
#include <asm/traps.h>
Expand Down Expand Up @@ -446,6 +447,7 @@ unsigned long atari_register_vme_int(void)
free_vme_vec_bitmap |= 1 << i;
return VME_SOURCE_BASE + i;
}
EXPORT_SYMBOL(atari_register_vme_int);


void atari_unregister_vme_int(unsigned long irq)
Expand All @@ -455,5 +457,6 @@ void atari_unregister_vme_int(unsigned long irq)
free_vme_vec_bitmap &= ~(1 << irq);
}
}
EXPORT_SYMBOL(atari_unregister_vme_int);


35 changes: 0 additions & 35 deletions trunk/arch/m68k/atari/atari_ksyms.c

This file was deleted.

2 changes: 2 additions & 0 deletions trunk/arch/m68k/atari/atasound.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <linux/fcntl.h>
#include <linux/errno.h>
#include <linux/mm.h>
#include <linux/module.h>

#include <asm/atarihw.h>
#include <asm/system.h>
Expand All @@ -43,6 +44,7 @@ void atari_microwire_cmd (int cmd)
while( tt_microwire.mask != 0x7ff)
;
}
EXPORT_SYMBOL(atari_microwire_cmd);


/* PSG base frequency */
Expand Down
11 changes: 11 additions & 0 deletions trunk/arch/m68k/atari/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/vt_kern.h>
#include <linux/module.h>

#include <asm/bootinfo.h>
#include <asm/setup.h>
Expand All @@ -43,10 +44,20 @@
#include <asm/io.h>

u_long atari_mch_cookie;
EXPORT_SYMBOL(atari_mch_cookie);

u_long atari_mch_type;
EXPORT_SYMBOL(atari_mch_type);

struct atari_hw_present atari_hw_present;
EXPORT_SYMBOL(atari_hw_present);

u_long atari_switches;
EXPORT_SYMBOL(atari_switches);

int atari_dont_touch_floppy_select;
EXPORT_SYMBOL(atari_dont_touch_floppy_select);

int atari_rtc_year_offset;

/* local function prototypes */
Expand Down
6 changes: 6 additions & 0 deletions trunk/arch/m68k/atari/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,23 @@
#include <linux/console.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/module.h>

#include <asm/atarihw.h>
#include <asm/atariints.h>

/* Flag that Modem1 port is already initialized and used */
int atari_MFP_init_done;
EXPORT_SYMBOL(atari_MFP_init_done);

/* Flag that Modem1 port is already initialized and used */
int atari_SCC_init_done;
EXPORT_SYMBOL(atari_SCC_init_done);

/* Can be set somewhere, if a SCC master reset has already be done and should
* not be repeated; used by kgdb */
int atari_SCC_reset_done;
EXPORT_SYMBOL(atari_SCC_reset_done);

static struct console atari_console_driver = {
.name = "debug",
Expand Down
5 changes: 5 additions & 0 deletions trunk/arch/m68k/atari/stdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/wait.h>
#include <linux/module.h>

#include <asm/atari_stdma.h>
#include <asm/atariints.h>
Expand Down Expand Up @@ -91,6 +92,7 @@ void stdma_lock(irq_handler_t handler, void *data)
stdma_isr_data = data;
local_irq_restore(flags);
}
EXPORT_SYMBOL(stdma_lock);


/*
Expand All @@ -117,6 +119,7 @@ void stdma_release(void)

local_irq_restore(flags);
}
EXPORT_SYMBOL(stdma_release);


/*
Expand All @@ -134,6 +137,7 @@ int stdma_others_waiting(void)
{
return waitqueue_active(&stdma_wait);
}
EXPORT_SYMBOL(stdma_others_waiting);


/*
Expand All @@ -155,6 +159,7 @@ int stdma_islocked(void)
{
return stdma_locked;
}
EXPORT_SYMBOL(stdma_islocked);


/*
Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/m68k/atari/stram.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <linux/bootmem.h>
#include <linux/mount.h>
#include <linux/blkdev.h>
#include <linux/module.h>

#include <asm/setup.h>
#include <asm/machdep.h>
Expand Down Expand Up @@ -208,6 +209,7 @@ void *atari_stram_alloc(long size, const char *owner)
}
return( addr );
}
EXPORT_SYMBOL(atari_stram_alloc);

void atari_stram_free( void *addr )

Expand Down Expand Up @@ -237,6 +239,7 @@ void atari_stram_free( void *addr )
printk( KERN_ERR "atari_stram_free: cannot free block at %p "
"(called from %p)\n", addr, __builtin_return_address(0) );
}
EXPORT_SYMBOL(atari_stram_free);


/* ------------------------------------------------------------------------ */
Expand Down

0 comments on commit 621f994

Please sign in to comment.