aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/prom/segment.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-23 16:53:23 +1000
committerPaul Mackerras <paulus@samba.org>2008-05-23 16:53:23 +1000
commitacf464817d5e7be9fb67aec4027dbee0ac9be17a (patch)
tree39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /arch/sparc/prom/segment.c
parent[POWERPC] Remove unnecessary cast in arch_deref_entry_point() (diff)
parent[POWERPC] iSeries: Remove unused mail address (diff)
downloadlinux-dev-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.xz
linux-dev-acf464817d5e7be9fb67aec4027dbee0ac9be17a.zip
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'arch/sparc/prom/segment.c')
-rw-r--r--arch/sparc/prom/segment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/prom/segment.c b/arch/sparc/prom/segment.c
index 09d6460165ab..04fd03a7f926 100644
--- a/arch/sparc/prom/segment.c
+++ b/arch/sparc/prom/segment.c
@@ -1,4 +1,4 @@
-/* $Id: segment.c,v 1.7 2000/08/26 02:38:03 anton Exp $
+/*
* segment.c: Prom routine to map segments in other contexts before
* a standalone is completely mapped. This is for sun4 and
* sun4c architectures only.