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/stir4200.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/stir4200.c')
| -rw-r--r-- | drivers/net/irda/stir4200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c index e5698fa30a4f..41c96b3d8152 100644 --- a/drivers/net/irda/stir4200.c +++ b/drivers/net/irda/stir4200.c | |||
| @@ -219,7 +219,7 @@ static inline int read_reg(struct stir_cb *stir, __u16 reg, | |||
| 219 | 219 | ||
| 220 | static inline int isfir(u32 speed) | 220 | static inline int isfir(u32 speed) |
| 221 | { | 221 | { |
| 222 | return (speed == 4000000); | 222 | return speed == 4000000; |
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | /* | 225 | /* |