summaryrefslogtreecommitdiff
path: root/arch/mips/include/asm/sgialib.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-12-24 09:16:02 +0300
committerPaul Mundt <lethal@linux-sh.org>2009-12-24 09:16:02 +0300
commitf34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch)
treee53c9e39b3149221779c10595bc59fa02de4f45f /arch/mips/include/asm/sgialib.h
parent76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff)
parent32b53076c31ce9159740b744d5eb5d9505312add (diff)
downloadlinux-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.tar.xz
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/mips/include/asm/sgialib.h')
-rw-r--r--arch/mips/include/asm/sgialib.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/include/asm/sgialib.h b/arch/mips/include/asm/sgialib.h
index bfce5c786f1c..63741ca1e422 100644
--- a/arch/mips/include/asm/sgialib.h
+++ b/arch/mips/include/asm/sgialib.h
@@ -85,8 +85,7 @@ extern void prom_identify_arch(void);
extern PCHAR ArcGetEnvironmentVariable(PCHAR name);
extern LONG ArcSetEnvironmentVariable(PCHAR name, PCHAR value);
-/* ARCS command line acquisition and parsing. */
-extern char *prom_getcmdline(void);
+/* ARCS command line parsing. */
extern void prom_init_cmdline(void);
/* Acquiring info about the current time, etc. */