summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx23418.h
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-04-13 13:32:28 +0200
committerPatrick McHardy <kaber@trash.net>2011-04-13 13:32:28 +0200
commitb32e3dc7860d00124fa432dba09667e647cb9bcc (patch)
tree2fa6e56f389431dfb84609d3d7572cad76e88e71 /drivers/media/video/cx18/cx23418.h
parentnetfilter: ipset: References are protected by rwlock instead of mutex (diff)
parentnetfilter: xt_conntrack: fix inverted conntrack direction test (diff)
downloadlinux-b32e3dc7860d00124fa432dba09667e647cb9bcc.tar.xz
linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.zip
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'drivers/media/video/cx18/cx23418.h')
-rw-r--r--drivers/media/video/cx18/cx23418.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h
index 7e40035028d2..935f557acbd0 100644
--- a/drivers/media/video/cx18/cx23418.h
+++ b/drivers/media/video/cx18/cx23418.h
@@ -477,7 +477,7 @@
/* The are no buffers ready. Try again soon! */
#define CXERR_NODATA_AGAIN 0x00001E
-/* The stream is stopping. Function not alllowed now! */
+/* The stream is stopping. Function not allowed now! */
#define CXERR_STOPPING_STATUS 0x00001F
/* Trying to access hardware when the power is turned OFF */