diff options
| author | Gerd Knorr <devnull@localhost> | 2004-11-23 17:29:09 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-11-23 17:29:09 +0000 |
| commit | 32b5a869607ea6d1f30bc165dddec51a611b6632 (patch) | |
| tree | 63a1366c345c46b6fcde4910c1230622e86d9174 /linux/drivers/media/video/cx88 | |
| parent | 776d033700ac5cfcd9a30facfcbb3d4148667a2e (diff) | |
| download | mediapointer-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')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 6 |
2 files changed, 5 insertions, 5 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; diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 8100f5d4d..ce82fa859 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.40 2004/11/03 09:04:51 kraxel Exp $ + * $Id: cx88.h,v 1.41 2004/11/23 17:29:09 kraxel Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -236,8 +236,8 @@ struct cx88_core { /* pci stuff */ int pci_bus; int pci_slot; - u32 *lmmio; - u8 *bmmio; + u32 __iomem *lmmio; + u8 __iomem *bmmio; u32 shadow[SHADOW_MAX]; /* i2c i/o */ |