summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-core.c
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2004-11-23 17:29:09 +0000
committerGerd Knorr <devnull@localhost>2004-11-23 17:29:09 +0000
commit32b5a869607ea6d1f30bc165dddec51a611b6632 (patch)
tree63a1366c345c46b6fcde4910c1230622e86d9174 /linux/drivers/media/video/cx88/cx88-core.c
parent776d033700ac5cfcd9a30facfcbb3d4148667a2e (diff)
downloadmediapointer-dvb-s2-32b5a869607ea6d1f30bc165dddec51a611b6632.tar.gz
mediapointer-dvb-s2-32b5a869607ea6d1f30bc165dddec51a611b6632.tar.bz2
- merge iomem annotations from Al Viro.
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-core.c')
-rw-r--r--linux/drivers/media/video/cx88/cx88-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index 9b183166f..66c33af6b 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-core.c,v 1.16 2004/11/17 18:47:47 kraxel Exp $
+ * $Id: cx88-core.c,v 1.17 2004/11/23 17:29:09 kraxel Exp $
*
* device driver for Conexant 2388x based TV cards
* driver core
@@ -1131,7 +1131,7 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci)
cx88_pci_quirks(core->name, pci);
core->lmmio = ioremap(pci_resource_start(pci,0),
pci_resource_len(pci,0));
- core->bmmio = (u8*)core->lmmio;
+ core->bmmio = (u8 __iomem *)core->lmmio;
/* board config */
core->board = UNSET;