diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-18 18:31:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-18 18:31:20 -0400 |
commit | 6c0741fbdee5bd0f8ed13ac287c4ab18e8ba7d83 (patch) | |
tree | 7513cdadc661cfe0bd1625145a4876e54df191ca /arch/arm/mach-sa1100/generic.h | |
parent | 628f87f3d585bd0c2b0e39df039585d7a5831cc9 (diff) | |
parent | 118ec0b3e02e7d22cf27b9f5a2836fa6f395b61a (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-sa1100/generic.h')
-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); | |||
39 | 39 | ||
40 | struct irda_platform_data; | 40 | struct irda_platform_data; |
41 | void sa11x0_set_irda_data(struct irda_platform_data *irda); | 41 | void sa11x0_set_irda_data(struct irda_platform_data *irda); |
42 | |||
43 | struct mcp_plat_data; | ||
44 | void sa11x0_set_mcp_data(struct mcp_plat_data *data); | ||