diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-09 07:48:42 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-09 21:55:25 -0400 |
commit | 39e3eb7265b8698e5f607a317af13c9478274736 (patch) | |
tree | 927b34392c7d74b38d52749c2311f6dfe7285851 /include/asm-ppc | |
parent | 8de242e60a441f177dd51b323894b17d3d63e9f2 (diff) |
[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 3247bea5fc2b..7b06b4e6bf30 100644 --- a/include/asm-ppc/commproc.h +++ b/include/asm-ppc/commproc.h | |||
@@ -690,8 +690,7 @@ typedef struct risc_timer_pram { | |||
690 | #define CICR_IEN ((uint)0x00000080) /* Int. enable */ | 690 | #define CICR_IEN ((uint)0x00000080) /* Int. enable */ |
691 | #define CICR_SPS ((uint)0x00000001) /* SCC Spread */ | 691 | #define CICR_SPS ((uint)0x00000001) /* SCC Spread */ |
692 | 692 | ||
693 | extern void cpm_install_handler(int vec, | 693 | extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id); |
694 | void (*handler)(void *, struct pt_regs *regs), void *dev_id); | ||
695 | extern void cpm_free_handler(int vec); | 694 | extern void cpm_free_handler(int vec); |
696 | 695 | ||
697 | #endif /* __CPM_8XX__ */ | 696 | #endif /* __CPM_8XX__ */ |
diff --git a/include/asm-ppc/gt64260.h b/include/asm-ppc/gt64260.h index cd0ef644943d..9e63b3cfffca 100644 --- a/include/asm-ppc/gt64260.h +++ b/include/asm-ppc/gt64260.h | |||
@@ -315,7 +315,7 @@ int gt64260_get_base(u32 *base); | |||
315 | int gt64260_pci_exclude_device(u8 bus, u8 devfn); | 315 | int gt64260_pci_exclude_device(u8 bus, u8 devfn); |
316 | 316 | ||
317 | void gt64260_init_irq(void); | 317 | void gt64260_init_irq(void); |
318 | int gt64260_get_irq(struct pt_regs *regs); | 318 | int gt64260_get_irq(void); |
319 | 319 | ||
320 | void gt64260_mpsc_progress(char *s, unsigned short hex); | 320 | void gt64260_mpsc_progress(char *s, unsigned short hex); |
321 | 321 | ||
diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h index 7e9842805a28..64c8874618dc 100644 --- a/include/asm-ppc/mpc52xx.h +++ b/include/asm-ppc/mpc52xx.h | |||
@@ -415,7 +415,7 @@ struct mpc52xx_cdm { | |||
415 | #ifndef __ASSEMBLY__ | 415 | #ifndef __ASSEMBLY__ |
416 | 416 | ||
417 | extern void mpc52xx_init_irq(void); | 417 | extern void mpc52xx_init_irq(void); |
418 | extern int mpc52xx_get_irq(struct pt_regs *regs); | 418 | extern int mpc52xx_get_irq(void); |
419 | 419 | ||
420 | extern unsigned long mpc52xx_find_end_of_memory(void); | 420 | extern unsigned long mpc52xx_find_end_of_memory(void); |
421 | extern void mpc52xx_set_bat(void); | 421 | extern void mpc52xx_set_bat(void); |
diff --git a/include/asm-ppc/mv64x60.h b/include/asm-ppc/mv64x60.h index 663edbee3e91..db3776f18198 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); | |||
336 | 336 | ||
337 | 337 | ||
338 | void gt64260_init_irq(void); | 338 | void gt64260_init_irq(void); |
339 | int gt64260_get_irq(struct pt_regs *regs); | 339 | int gt64260_get_irq(void); |
340 | void mv64360_init_irq(void); | 340 | void mv64360_init_irq(void); |
341 | int mv64360_get_irq(struct pt_regs *regs); | 341 | int mv64360_get_irq(void); |
342 | 342 | ||
343 | u32 mv64x60_mask(u32 val, u32 num_bits); | 343 | u32 mv64x60_mask(u32 val, u32 num_bits); |
344 | u32 mv64x60_shift_left(u32 val, u32 num_bits); | 344 | u32 mv64x60_shift_left(u32 val, u32 num_bits); |