diff options
author | Linus Torvalds | 2010-08-10 06:02:42 +0200 |
---|---|---|
committer | Linus Torvalds | 2010-08-10 06:02:42 +0200 |
commit | 1989425a3aed215f1accd5d8019b18b345166a63 (patch) | |
tree | edf01f8cddce137588a501d74eedb43e98911c62 /arch/powerpc/include/asm/mpc52xx.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap... (diff) | |
parent | powerpc: fix build with make 3.82 (diff) | |
download | kernel-qcow2-linux-1989425a3aed215f1accd5d8019b18b345166a63.tar.gz kernel-qcow2-linux-1989425a3aed215f1accd5d8019b18b345166a63.tar.xz kernel-qcow2-linux-1989425a3aed215f1accd5d8019b18b345166a63.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: fix build with make 3.82
Revert "Input: appletouch - fix integer overflow issue"
memblock: Fix memblock_is_region_reserved() to return a boolean
powerpc: Trim defconfigs
powerpc: fix i8042 module build error
sound/soc: mpc5200_psc_ac97: Use gpio pins for cold reset
powerpc/5200: add mpc5200_psc_ac97_gpio_reset
Diffstat (limited to 'arch/powerpc/include/asm/mpc52xx.h')
-rw-r--r-- | arch/powerpc/include/asm/mpc52xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/mpc52xx.h b/arch/powerpc/include/asm/mpc52xx.h index b664ce79a172..1f41382eda38 100644 --- a/arch/powerpc/include/asm/mpc52xx.h +++ b/arch/powerpc/include/asm/mpc52xx.h @@ -271,6 +271,7 @@ struct mpc52xx_intr { /* mpc52xx_common.c */ extern void mpc5200_setup_xlb_arbiter(void); extern void mpc52xx_declare_of_platform_devices(void); +extern int mpc5200_psc_ac97_gpio_reset(int psc_number); extern void mpc52xx_map_common_devices(void); extern int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv); extern unsigned int mpc52xx_get_xtal_freq(struct device_node *node); |