diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:34:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:34:31 -0400 |
| commit | 2321fbd2b87539edc1fbfc2e186528a1ef93835f (patch) | |
| tree | cd7d22794eb262b040b6c2f99f9a46d0293935f2 /arch/arm/mach-sa1100/generic.h | |
| parent | 3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 (diff) | |
| parent | 323cdfc191b7c1597dc748175062c368568d6af4 (diff) | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git
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 bfe41da9923e..279e3afa3c39 100644 --- a/arch/arm/mach-sa1100/generic.h +++ b/arch/arm/mach-sa1100/generic.h | |||
| @@ -34,5 +34,8 @@ struct resource; | |||
| 34 | extern void sa11x0_set_flash_data(struct flash_platform_data *flash, | 34 | extern void sa11x0_set_flash_data(struct flash_platform_data *flash, |
| 35 | struct resource *res, int nr); | 35 | struct resource *res, int nr); |
| 36 | 36 | ||
| 37 | struct sa11x0_ssp_plat_ops; | ||
| 38 | extern void sa11x0_set_ssp_data(struct sa11x0_ssp_plat_ops *ops); | ||
| 39 | |||
| 37 | struct irda_platform_data; | 40 | struct irda_platform_data; |
| 38 | void sa11x0_set_irda_data(struct irda_platform_data *irda); | 41 | void sa11x0_set_irda_data(struct irda_platform_data *irda); |