summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k/openprom.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-21 15:06:09 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-21 15:06:09 +0200
commite66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch)
tree3337cba94c7444b06fdb0e8b487287d07b71f4a0 /include/asm-m68k/openprom.h
parent55ca089e2579de90f048aca2a3030b8b2f864813 (diff)
parent14b395e35d1afdd8019d11b92e28041fad591b71 (diff)
downloadkernel-crypto-e66d90fb4abd0a27ee96f57a32fb561221c4d6ae.tar.gz
kernel-crypto-e66d90fb4abd0a27ee96f57a32fb561221c4d6ae.tar.xz
kernel-crypto-e66d90fb4abd0a27ee96f57a32fb561221c4d6ae.zip
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'include/asm-m68k/openprom.h')
-rw-r--r--include/asm-m68k/openprom.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m68k/openprom.h b/include/asm-m68k/openprom.h
index 869ab9176e9..d33cdadf78e 100644
--- a/include/asm-m68k/openprom.h
+++ b/include/asm-m68k/openprom.h
@@ -1,4 +1,3 @@
-/* $Id: openprom.h,v 1.19 1996/09/25 03:51:08 davem Exp $ */
#ifndef __SPARC_OPENPROM_H
#define __SPARC_OPENPROM_H