diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-12 11:27:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-12 11:27:22 +0200 |
| commit | bb6dfb32f90094fea647e1f27d994a8b6ddd2766 (patch) | |
| tree | e63681727543bcc3251bbc82b81a9cc822cc3f5e /drivers/usb/host/isp1760-if.c | |
| parent | 4f384f8bcdb5d618a0a68fb84c809e602c798b8f (diff) | |
| parent | 5e70b7f3c24468bb1635b295945edb48ecd9656a (diff) | |
| download | linux-bb6dfb32f90094fea647e1f27d994a8b6ddd2766.tar.gz linux-bb6dfb32f90094fea647e1f27d994a8b6ddd2766.tar.bz2 linux-bb6dfb32f90094fea647e1f27d994a8b6ddd2766.zip | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'drivers/usb/host/isp1760-if.c')
| -rw-r--r-- | drivers/usb/host/isp1760-if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c index 440bf94f0d4c..c9db3fe98726 100644 --- a/drivers/usb/host/isp1760-if.c +++ b/drivers/usb/host/isp1760-if.c @@ -104,8 +104,8 @@ static u32 nxp_pci_io_base; static u32 iolength; static u32 pci_mem_phy0; static u32 length; -static u8 *chip_addr; -static u8 *iobase; +static u8 __iomem *chip_addr; +static u8 __iomem *iobase; static int __devinit isp1761_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) |