summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion/common.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-03-18 07:44:31 +0100
committerDavid S. Miller <davem@davemloft.net>2008-03-18 07:44:31 +0100
commit2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch)
tree9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /arch/arm/mach-orion/common.h
parent[IPV4]: esp_output() misannotations (diff)
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-2f633928cbba8a5858bb39b11e7219a41b0fbef5.tar.xz
linux-2f633928cbba8a5858bb39b11e7219a41b0fbef5.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-orion/common.h')
-rw-r--r--arch/arm/mach-orion/common.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-orion/common.h b/arch/arm/mach-orion/common.h
index 10154ec885df..501497cc2c4d 100644
--- a/arch/arm/mach-orion/common.h
+++ b/arch/arm/mach-orion/common.h
@@ -83,4 +83,10 @@ struct mv_sata_platform_data;
void __init orion_sata_init(struct mv_sata_platform_data *sata_data);
+struct machine_desc;
+struct meminfo;
+struct tag;
+extern void __init tag_fixup_mem32(struct machine_desc *, struct tag *,
+ char **, struct meminfo *);
+
#endif /* __ARCH_ORION_COMMON_H__ */