diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-23 16:53:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-23 16:53:23 +1000 |
| commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
| tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /include/asm-sparc/ioctl.h | |
| parent | 80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff) | |
| parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
| download | talos-op-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.tar.gz talos-op-linux-acf464817d5e7be9fb67aec4027dbee0ac9be17a.zip | |
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'include/asm-sparc/ioctl.h')
| -rw-r--r-- | include/asm-sparc/ioctl.h | 1 |
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 |
