diff options
author | Russ Meyerriecks <rmeyerreicks@digium.com> | 2010-01-18 21:19:48 +0000 |
---|---|---|
committer | Russ Meyerriecks <rmeyerreicks@digium.com> | 2010-01-18 21:19:48 +0000 |
commit | 4276bdd18c3d3e1552c08c7b3636dfd5a733cf63 (patch) | |
tree | 105b45cac4c94cf0bf87f3ff04f27fdd6d887fd3 | |
parent | a4bef70b395ec086b4966aec46a863a818d19772 (diff) |
wct4xxp: Replaced a lost member of the t4 struct, which was clobbered in
the merge commits.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7941 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/wct4xxp/base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 77dfbfa..463d183 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -325,6 +325,7 @@ struct t4 { #endif int irq; /* IRQ used by device */ int order; /* Order */ + int flags; /* Device flags */ unsigned int falc31 : 1; /* are we falc v3.1 (atomic not necessary) */ int master; /* Are we master */ int ledreg; /* LED Register */ |