git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
[pandora-kernel.git]
/
drivers
/
media
/
video
/
zoran_card.c
diff --git
a/drivers/media/video/zoran_card.c
b/drivers/media/video/zoran_card.c
index
6e0ac4c
..
690281b
100644
(file)
--- a/
drivers/media/video/zoran_card.c
+++ b/
drivers/media/video/zoran_card.c
@@
-1270,7
+1270,7
@@
zoran_setup_videocodec (struct zoran *zr,
}
/*
- * Scan for a Buz card (actually for the PCI cont
o
ler ZR36057),
+ * Scan for a Buz card (actually for the PCI cont
rol
ler ZR36057),
* request the irq and map the io memory
*/
static int __devinit