Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

[cascardo/linux.git] / net / can / proc.c

diff --git a/net/can/proc.c b/net/can/proc.c
index 3b6dd31..ae56690 100644 (file)
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -397,7 +397,7 @@ static inline void can_rcvlist_sff_proc_show_one(struct seq_file *m,
        int i;
        int all_empty = 1;
 
-       /* check wether at least one list is non-empty */
+       /* check whether at least one list is non-empty */
        for (i = 0; i < 0x800; i++)
                if (!hlist_empty(&d->rx_sff[i])) {
                        all_empty = 0;