diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-02 09:58:49 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-02 09:58:49 -0400 |
| commit | 9e3be1edbe5ca57df51140b523168237b3a01f4d (patch) | |
| tree | a72c0ec1ce0fbcdcd12ecb6aad9bedcc94b94f9d /include/net/irda/irlap.h | |
| parent | 473f89fff76568a9f30c53b458e6323d48b0ab95 (diff) | |
| parent | 29c798fecb9b846b363b0a02fa662ff42fc19426 (diff) | |
Merge branch 'for-2.6.37' into HEAD
WARN() fix from Joe moved.
Conflicts:
sound/soc/codecs/wm_hubs.c
Diffstat (limited to 'include/net/irda/irlap.h')
| -rw-r--r-- | include/net/irda/irlap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h index 9d0c78ea92f..17fcd964f9d 100644 --- a/include/net/irda/irlap.h +++ b/include/net/irda/irlap.h | |||
| @@ -282,7 +282,7 @@ static inline int irlap_is_primary(struct irlap_cb *self) | |||
| 282 | default: | 282 | default: |
| 283 | ret = -1; | 283 | ret = -1; |
| 284 | } | 284 | } |
| 285 | return(ret); | 285 | return ret; |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | /* Clear a pending IrLAP disconnect. - Jean II */ | 288 | /* Clear a pending IrLAP disconnect. - Jean II */ |