diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 16:16:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 16:16:33 -0700 |
| commit | 3c693024cffa5c96a20b969f4efd058675e7700f (patch) | |
| tree | 2e49a90c3e67a898770fe0ea735d00326dbe3f69 /include | |
| parent | 107c3a73e0ee037322efa00fa3cb45b3b7eb6069 (diff) | |
| parent | 10270613fb4d5a44c335cfa13e9626bf5743c01d (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix windfarm platform device usage
[POWERPC] Fix i2c-powermac platform device usage
[POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs
[POWERPC] ARCH=ppc pt_regs fixes
[POWERPC] Update maple defconfig
[POWERPC] Fix Maple secondary IDE interrupt
[POWERPC] Make U4 PCIe work on maple
[POWERPC] cell: fix default zImage build target
[POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces
[POWERPC] Fix xmon IRQ handler for pt_regs removal
Diffstat (limited to 'include')
| -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 3247bea5fc2..7b06b4e6bf3 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 cd0ef644943..9e63b3cfffc 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 7e9842805a2..64c8874618d 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 663edbee3e9..db3776f1819 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); |