diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 10:31:54 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 10:31:58 +0000 |
| commit | cde9efef401563943d5a58eb9b7274bfdc08ca9b (patch) | |
| tree | 858a436055612db6282dc63db0fe3ba41147056a /arch/arm/mach-ux500/include/mach/setup.h | |
| parent | 50401d77ee4904673042dd737eed436067cc23f5 (diff) | |
| parent | 60ebe1568fd15b7ffa101acc645069e27d546ed6 (diff) | |
Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable
Diffstat (limited to 'arch/arm/mach-ux500/include/mach/setup.h')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/setup.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/include/mach/setup.h b/arch/arm/mach-ux500/include/mach/setup.h index 54bbe648bf58..469877e0de90 100644 --- a/arch/arm/mach-ux500/include/mach/setup.h +++ b/arch/arm/mach-ux500/include/mach/setup.h @@ -18,14 +18,19 @@ extern void __init ux500_map_io(void); extern void __init u5500_map_io(void); extern void __init u8500_map_io(void); -extern void __init ux500_init_devices(void); extern void __init u5500_init_devices(void); extern void __init u8500_init_devices(void); extern void __init ux500_init_irq(void); + +extern void __init u5500_sdi_init(void); + +extern void __init db5500_dma_init(void); + /* We re-use nomadik_timer for this platform */ extern void nmdk_timer_init(void); +struct amba_device; extern void __init amba_add_devices(struct amba_device *devs[], int num); struct sys_timer; |