diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/linux/ixjuser.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/linux/ixjuser.h')
| -rw-r--r-- | include/linux/ixjuser.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ixjuser.h b/include/linux/ixjuser.h index 88121166d715..fd1756d3a47e 100644 --- a/include/linux/ixjuser.h +++ b/include/linux/ixjuser.h | |||
| @@ -42,8 +42,6 @@ | |||
| 42 | * | 42 | * |
| 43 | *****************************************************************************/ | 43 | *****************************************************************************/ |
| 44 | 44 | ||
| 45 | static char ixjuser_h_rcsid[] = "$Id: ixjuser.h,v 4.1 2001/08/05 00:17:37 craigs Exp $"; | ||
| 46 | |||
| 47 | #include <linux/telephony.h> | 45 | #include <linux/telephony.h> |
| 48 | 46 | ||
| 49 | 47 | ||