aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/ioctl.h
diff options
context:
space:
mode:
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-05-23 13:48:37 +1000
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-05-23 13:48:37 +1000
commitc1e554aeea12d2dab5183e011c27dee6142dc927 (patch)
treea44908fa5c2f1f24b6f7e7313b60e49cd3235cdd /include/asm-sparc/ioctl.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus (diff)
parentHTC_EGPIO is ARM-only (diff)
downloadlinux-dev-c1e554aeea12d2dab5183e011c27dee6142dc927.tar.xz
linux-dev-c1e554aeea12d2dab5183e011c27dee6142dc927.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/asm-sparc/ioctl.h')
-rw-r--r--include/asm-sparc/ioctl.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc/ioctl.h b/include/asm-sparc/ioctl.h
index e6fc4de19940..7d6bd51321b9 100644
--- a/include/asm-sparc/ioctl.h
+++ b/include/asm-sparc/ioctl.h
@@ -1,4 +1,3 @@
-/* $Id: ioctl.h,v 1.6 1999/12/01 23:58:36 davem Exp $ */
#ifndef _SPARC_IOCTL_H
#define _SPARC_IOCTL_H