diff options
author | Steve French <sfrench@us.ibm.com> | 2006-03-03 11:27:25 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-03-03 11:27:25 +0000 |
commit | c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a (patch) | |
tree | 99b48ef0f5217fddc0aa897d9e60d95ace7da6ff /drivers/char/synclink_gt.c | |
parent | 13298defe5323c7fdcac268f588d8d1090758fb8 (diff) | |
parent | c499ec24c31edf270e777a868ffd0daddcfe7ebd (diff) | |
download | linux-c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a.tar.gz |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/char/synclink_gt.c')
-rw-r--r-- | drivers/char/synclink_gt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c index a85a60a93deb..b046390cd256 100644 --- a/drivers/char/synclink_gt.c +++ b/drivers/char/synclink_gt.c @@ -306,7 +306,7 @@ struct slgt_info { int tx_active; unsigned char signals; /* serial signal states */ - unsigned int init_error; /* initialization error */ + int init_error; /* initialization error */ unsigned char *tx_buf; int tx_count; |