diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/irda/act200l-sir.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/irda/act200l-sir.c')
| -rw-r--r-- | drivers/net/irda/act200l-sir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/act200l-sir.c b/drivers/net/irda/act200l-sir.c index 37ab8c855719..8ff084f1d236 100644 --- a/drivers/net/irda/act200l-sir.c +++ b/drivers/net/irda/act200l-sir.c | |||
| @@ -199,7 +199,7 @@ static int act200l_reset(struct sir_dev *dev) | |||
| 199 | { | 199 | { |
| 200 | unsigned state = dev->fsm.substate; | 200 | unsigned state = dev->fsm.substate; |
| 201 | unsigned delay = 0; | 201 | unsigned delay = 0; |
| 202 | u8 control[9] = { | 202 | static const u8 control[9] = { |
| 203 | ACT200L_REG15, | 203 | ACT200L_REG15, |
| 204 | ACT200L_REG13 | ACT200L_SHDW, | 204 | ACT200L_REG13 | ACT200L_SHDW, |
| 205 | ACT200L_REG21 | ACT200L_EXCK | ACT200L_OSCL, | 205 | ACT200L_REG21 | ACT200L_EXCK | ACT200L_OSCL, |