diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-09 12:48:42 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-10 11:55:25 +1000 |
| commit | 39e3eb7265b8698e5f607a317af13c9478274736 (patch) | |
| tree | 927b34392c7d74b38d52749c2311f6dfe7285851 /include/asm-ppc | |
| parent | 8de242e60a441f177dd51b323894b17d3d63e9f2 (diff) | |
| download | kernel_samsung_aries-39e3eb7265b8698e5f607a317af13c9478274736.zip kernel_samsung_aries-39e3eb7265b8698e5f607a317af13c9478274736.tar.gz kernel_samsung_aries-39e3eb7265b8698e5f607a317af13c9478274736.tar.bz2 | |
[POWERPC] ARCH=ppc pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/commproc.h | 3 | ||||
| -rw-r--r-- | include/asm-ppc/gt64260.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc/mpc52xx.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc/mv64x60.h | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/include/asm-ppc/commproc.h b/include/asm-ppc/commproc.h index 3247bea..7b06b4e 100644 --- a/include/asm-ppc/commproc.h +++ b/include/asm-ppc/commproc.h @@ -690,8 +690,7 @@ typedef struct risc_timer_pram { #define CICR_IEN ((uint)0x00000080) /* Int. enable */ #define CICR_SPS ((uint)0x00000001) /* SCC Spread */ -extern void cpm_install_handler(int vec, - void (*handler)(void *, struct pt_regs *regs), void *dev_id); +extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); extern void cpm_free_handler(int vec); #endif /* __CPM_8XX__ */ diff --git a/include/asm-ppc/gt64260.h b/include/asm-ppc/gt64260.h index cd0ef64..9e63b3c 100644 --- a/include/asm-ppc/gt64260.h +++ b/include/asm-ppc/gt64260.h @@ -315,7 +315,7 @@ int gt64260_get_base(u32 *base); int gt64260_pci_exclude_device(u8 bus, u8 devfn); void gt64260_init_irq(void); -int gt64260_get_irq(struct pt_regs *regs); +int gt64260_get_irq(void); void gt64260_mpsc_progress(char *s, unsigned short hex); diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h index 7e98428..64c8874 100644 --- a/include/asm-ppc/mpc52xx.h +++ b/include/asm-ppc/mpc52xx.h @@ -415,7 +415,7 @@ struct mpc52xx_cdm { #ifndef __ASSEMBLY__ extern void mpc52xx_init_irq(void); -extern int mpc52xx_get_irq(struct pt_regs *regs); +extern int mpc52xx_get_irq(void); extern unsigned long mpc52xx_find_end_of_memory(void); extern void mpc52xx_set_bat(void); diff --git a/include/asm-ppc/mv64x60.h b/include/asm-ppc/mv64x60.h index 663edbe..db3776f 100644 --- a/include/asm-ppc/mv64x60.h +++ b/include/asm-ppc/mv64x60.h @@ -336,9 +336,9 @@ int mv64x60_pci_exclude_device(u8 bus, u8 devfn); void gt64260_init_irq(void); -int gt64260_get_irq(struct pt_regs *regs); +int gt64260_get_irq(void); void mv64360_init_irq(void); -int mv64360_get_irq(struct pt_regs *regs); +int mv64360_get_irq(void); u32 mv64x60_mask(u32 val, u32 num_bits); u32 mv64x60_shift_left(u32 val, u32 num_bits); |