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/bttvp.h | |
| 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/bttvp.h')
| -rw-r--r-- | linux/drivers/media/video/bttvp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h index d978cd97d..205f149e3 100644 --- a/linux/drivers/media/video/bttvp.h +++ b/linux/drivers/media/video/bttvp.h @@ -1,5 +1,5 @@ /* - $Id: bttvp.h,v 1.13 2004/11/19 18:07:12 kraxel Exp $ + $Id: bttvp.h,v 1.14 2004/11/23 17:29:09 kraxel Exp $ bttv - Bt848 frame grabber driver @@ -287,7 +287,7 @@ struct bttv { /* pci device config */ unsigned short id; unsigned char revision; - unsigned char *bt848_mmio; /* pointer to mmio */ + unsigned char __iomem *bt848_mmio; /* pointer to mmio */ /* card configuration info */ unsigned int cardid; /* pci subsystem id (bt878 based ones) */ @@ -401,7 +401,7 @@ struct bttv { #endif -#define btwrite(dat,adr) writel((dat), (char *) (btv->bt848_mmio+(adr))) +#define btwrite(dat,adr) writel((dat), btv->bt848_mmio+(adr)) #define btread(adr) readl(btv->bt848_mmio+(adr)) #define btand(dat,adr) btwrite((dat) & btread(adr), adr) |