aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sk98lin/skdim.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-01 16:38:18 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-01 16:38:18 -0800
commit1399ff54741b3aa0aaf5097b8559fa30277ebe61 (patch)
treeb384aef82007144b067cc171d2a9aa168b50b262 /drivers/net/sk98lin/skdim.c
parentbb37b94c68e7b37eecea8576039ae9396ca07839 (diff)
parent6b44d4e69c6144d0df71ab47ec90d2009237d48f (diff)
downloadkernel_samsung_smdk4412-1399ff54741b3aa0aaf5097b8559fa30277ebe61.zip
kernel_samsung_smdk4412-1399ff54741b3aa0aaf5097b8559fa30277ebe61.tar.gz
kernel_samsung_smdk4412-1399ff54741b3aa0aaf5097b8559fa30277ebe61.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: Fix typos in drivers/isdn/hisax/isdnl2.c Fix typos in doc and comments BUG_ON conversion for fs/aio.c BUG_ON conversion for drivers/mmc/omap.c BUG_ON conversion for drivers/media/video/pwc/pwc-if.c Fix misc .c/.h comment typos Fix misc Kconfig typos Fix typos in /Documentation : Misc Fix typos in /Documentation : 'U-Z' Fix typos in /Documentation : 'T'' Fix jiffies.h comment tabify MAINTAINERS fix spelling error in include/linux/kernel.h mqueue.h: don't include linux/types.h
Diffstat (limited to 'drivers/net/sk98lin/skdim.c')
-rw-r--r--drivers/net/sk98lin/skdim.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sk98lin/skdim.c b/drivers/net/sk98lin/skdim.c
index 07c1b4c..37ce03f 100644
--- a/drivers/net/sk98lin/skdim.c
+++ b/drivers/net/sk98lin/skdim.c
@@ -252,7 +252,7 @@ SkDimEnableModerationIfNeeded(SK_AC *pAC) {
/*******************************************************************************
** Function : SkDimDisplayModerationSettings
-** Description : Displays the current settings regaring interrupt moderation
+** Description : Displays the current settings regarding interrupt moderation
** Programmer : Ralph Roesler
** Last Modified: 22-mar-03
** Returns : void (!)
@@ -510,7 +510,7 @@ EnableIntMod(SK_AC *pAC) {
/*******************************************************************************
** Function : DisableIntMod()
-** Description : Disbles the interrupt moderation independent of what inter-
+** Description : Disables the interrupt moderation independent of what inter-
** rupts are running or not
** Programmer : Ralph Roesler
** Last Modified: 23-mar-03