diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
| commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
| tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /include/linux/hiddev.h | |
| parent | 80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff) | |
| parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'include/linux/hiddev.h')
| -rw-r--r-- | include/linux/hiddev.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h index acbdae6d7ae1..a416b904ba90 100644 --- a/include/linux/hiddev.h +++ b/include/linux/hiddev.h | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | #define _HIDDEV_H | 2 | #define _HIDDEV_H |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| 5 | * $Id: hiddev.h,v 1.2 2001/04/26 11:26:09 vojtech Exp $ | ||
| 6 | * | ||
| 7 | * Copyright (c) 1999-2000 Vojtech Pavlik | 5 | * Copyright (c) 1999-2000 Vojtech Pavlik |
| 8 | * | 6 | * |
| 9 | * Sponsored by SuSE | 7 | * Sponsored by SuSE |