summaryrefslogtreecommitdiff
path: root/arch/mips/powertv/init.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-18 00:20:14 (GMT)
committerDavid S. Miller <davem@davemloft.net>2010-02-18 00:20:14 (GMT)
commit8c2fcadc933f713d51f46ec4dcd9b12830e0df84 (patch)
treee0797b2db664d702f9d02dd0f45efddb2f0d7fe9 /arch/mips/powertv/init.h
parent232486e1e9f34889424b68ee6270440b554479a2 (diff)
parentb0483e78e5c4c9871fc5541875b3bc006846d46b (diff)
downloadlinux-fsl-qoriq-8c2fcadc933f713d51f46ec4dcd9b12830e0df84.tar.xz
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/mips/powertv/init.h')
-rw-r--r--arch/mips/powertv/init.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/powertv/init.h b/arch/mips/powertv/init.h
index 7af6bf2..b194c34 100644
--- a/arch/mips/powertv/init.h
+++ b/arch/mips/powertv/init.h
@@ -22,7 +22,5 @@
#ifndef _POWERTV_INIT_H
#define _POWERTV_INIT_H
-extern int prom_argc;
-extern int *_prom_argv;
extern unsigned long _prom_memsize;
#endif