git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
telephony
/
ixj.h
diff --git
a/drivers/telephony/ixj.h
b/drivers/telephony/ixj.h
index
4c32a43
..
2c84113
100644
(file)
--- a/
drivers/telephony/ixj.h
+++ b/
drivers/telephony/ixj.h
@@
-1149,7
+1149,7
@@
typedef struct {
unsigned int firstring:1; /* First ring cadence is complete */
unsigned int pstncheck:1; /* Currently checking the PSTN Line */
unsigned int pstn_rmr:1;
- unsigned int x:3; /* unsed bits */
+ unsigned int x:3; /* un
u
sed bits */
} IXJ_FLAGS;