diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 17:06:48 -0400 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /include/linux/ixjuser.h | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
Auto merge with /home/aegl/GIT/linus
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 | ||