diff options
author | Russell King | 2012-03-26 00:56:30 +0200 |
---|---|---|
committer | Russell King | 2012-03-26 00:57:10 +0200 |
commit | 7256ecc2b7b91b4212ccc5511cb12254bdf806d0 (patch) | |
tree | 1a39b3de03cfc92c5b5dedfb01174d17b49df18a /arch/arm/mach-sa1100/generic.h | |
parent | Merge branch 'sa11x0-lcd' into sa11x0 (diff) | |
parent | MFD: mcp-sa11x0/assabet: move assabet reset handling out of mcp-sa11x0.c (diff) | |
download | kernel-qcow2-linux-7256ecc2b7b91b4212ccc5511cb12254bdf806d0.tar.gz kernel-qcow2-linux-7256ecc2b7b91b4212ccc5511cb12254bdf806d0.tar.xz kernel-qcow2-linux-7256ecc2b7b91b4212ccc5511cb12254bdf806d0.zip |
Merge branch 'sa11x0-mcp' into sa11x0
Conflicts:
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/generic.c
arch/arm/mach-sa1100/lart.c
arch/arm/mach-sa1100/shannon.c
Diffstat (limited to 'arch/arm/mach-sa1100/generic.h')
-rw-r--r-- | arch/arm/mach-sa1100/generic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h index 5c68be858e0c..9eb3b3cd5a63 100644 --- a/arch/arm/mach-sa1100/generic.h +++ b/arch/arm/mach-sa1100/generic.h @@ -36,6 +36,7 @@ struct irda_platform_data; void sa11x0_register_irda(struct irda_platform_data *irda); struct mcp_plat_data; +void sa11x0_ppc_configure_mcp(void); void sa11x0_register_mcp(struct mcp_plat_data *data); struct sa1100fb_mach_info; |