diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/telephony/ixj.h | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/telephony/ixj.h')
| -rw-r--r-- | drivers/telephony/ixj.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h index 51e3f7f6597b..fbea4541c234 100644 --- a/drivers/telephony/ixj.h +++ b/drivers/telephony/ixj.h | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | *****************************************************************************/ | 40 | *****************************************************************************/ |
| 41 | #define IXJ_VERSION 3031 | 41 | #define IXJ_VERSION 3031 |
| 42 | 42 | ||
| 43 | #include <linux/version.h> | ||
| 44 | #include <linux/types.h> | 43 | #include <linux/types.h> |
| 45 | 44 | ||
| 46 | #include <linux/ixjuser.h> | 45 | #include <linux/ixjuser.h> |