diff options
author | Paul Mackerras <paulus@samba.org> | 2005-09-25 22:51:50 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 22:51:50 +1000 |
commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /arch/arm/mach-sa1100/generic.h | |
parent | [PATCH] powerpc: merge semaphore.h (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-ucb (diff) | |
download | linux-dev-e5baa396af7560382d2cf3f0871d616b61fc284c.tar.xz linux-dev-e5baa396af7560382d2cf3f0871d616b61fc284c.zip |
Merge from Linus' tree.
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-sa1100/generic.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h index 279e3afa3c39..f085d68e568e 100644 --- a/arch/arm/mach-sa1100/generic.h +++ b/arch/arm/mach-sa1100/generic.h @@ -39,3 +39,6 @@ extern void sa11x0_set_ssp_data(struct sa11x0_ssp_plat_ops *ops); struct irda_platform_data; void sa11x0_set_irda_data(struct irda_platform_data *irda); + +struct mcp_plat_data; +void sa11x0_set_mcp_data(struct mcp_plat_data *data); |