aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/types.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-16 11:28:04 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-16 11:28:04 +0200
commit7aaaec38fcd9ef3172e69f8c19f20113830a8498 (patch)
treeb12a1c359ad53ae10601f77b3438bb27c3c8f337 /include/asm-sparc/types.h
parentx86: untangle pci dependencies (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff)
downloadlinux-dev-7aaaec38fcd9ef3172e69f8c19f20113830a8498.tar.xz
linux-dev-7aaaec38fcd9ef3172e69f8c19f20113830a8498.zip
Merge branch 'linus' into x86/kconfig
Diffstat (limited to 'include/asm-sparc/types.h')
-rw-r--r--include/asm-sparc/types.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc/types.h b/include/asm-sparc/types.h
index 1b08ef860a66..07734f942405 100644
--- a/include/asm-sparc/types.h
+++ b/include/asm-sparc/types.h
@@ -1,4 +1,3 @@
-/* $Id: types.h,v 1.13 2001/12/21 01:22:59 davem Exp $ */
#ifndef _SPARC_TYPES_H
#define _SPARC_TYPES_H