Commit deb09fa2 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] m68knommu: use irqreturn_t in ColdFire 5282 setup code

From: <gerg@snapgear.com>

Fixes to the Motorola ColdFire 5282 setup code:

. fix interrupt routine return types to be irqreturn_t
. add DMA base addresses array
parent 267c1309
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/machdep.h> #include <asm/machdep.h>
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
/***************************************************************************/ /***************************************************************************/
void coldfire_pit_tick(void); void coldfire_pit_tick(void);
void coldfire_pit_init(void (*handler)(int, void *, struct pt_regs *)); void coldfire_pit_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));
unsigned long coldfire_pit_offset(void); unsigned long coldfire_pit_offset(void);
void coldfire_trap_init(void); void coldfire_trap_init(void);
void coldfire_reset(void); void coldfire_reset(void);
...@@ -41,6 +42,8 @@ unsigned int dma_base_addr[MAX_M68K_DMA_CHANNELS] = { ...@@ -41,6 +42,8 @@ unsigned int dma_base_addr[MAX_M68K_DMA_CHANNELS] = {
MCF_MBAR + MCFDMA_BASE0, MCF_MBAR + MCFDMA_BASE0,
}; };
unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS];
/***************************************************************************/ /***************************************************************************/
void mcf_disableall(void) void mcf_disableall(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment