aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/setup.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-05-13 17:48:05 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-05-13 17:48:05 +0900
commitef4ed97d6bd91aa41907181e80a7feaf2721719a (patch)
treeadc44e858c150c41ebf1dd7c6ee2f6bcbac75502 /arch/sh/include/asm/setup.h
parentMerge branch 'sh/clkfwk' (diff)
parentsh: Ensure active regions have a backing PMB entry. (diff)
downloadlinux-dev-ef4ed97d6bd91aa41907181e80a7feaf2721719a.tar.xz
linux-dev-ef4ed97d6bd91aa41907181e80a7feaf2721719a.zip
Merge branch 'sh/lmb'
Conflicts: arch/sh/kernel/setup.c
Diffstat (limited to 'arch/sh/include/asm/setup.h')
-rw-r--r--arch/sh/include/asm/setup.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h
index 4758325bb24a..01fa17a3d759 100644
--- a/arch/sh/include/asm/setup.h
+++ b/arch/sh/include/asm/setup.h
@@ -19,6 +19,7 @@
#define COMMAND_LINE ((char *) (PARAM+0x100))
void sh_mv_setup(void);
+void check_for_initrd(void);
#endif /* __KERNEL__ */