Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / net / irda / parameters.c

diff --git a/net/irda/parameters.c b/net/irda/parameters.c
index 1324942f976c25056d95d985b408886ba9f45d34..75a72d203b01c785cd6dd70c59363f87e25a813b 100644 (file)
--- a/net/irda/parameters.c
+++ b/net/irda/parameters.c
@@ -563,7 +563,7 @@ static int irda_param_extract(void *self, __u8 *buf, int len,
  *    safe. Returns the number of bytes that was parsed
  *
  */
-int irda_param_extract_all(void *self, __u8 *buf, int len, 
+int irda_param_extract_all(void *self, __u8 *buf, int len,
                           pi_param_info_t *info)
 {
        int ret = -1;