diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /drivers/ide/pci/siimage.c | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/pci/siimage.c')
| -rw-r--r-- | drivers/ide/pci/siimage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index cc4be9621bc0..8d624afe8529 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
| @@ -492,7 +492,7 @@ static void proc_reports_siimage (struct pci_dev *dev, u8 clocking, const char * | |||
| 492 | 492 | ||
| 493 | static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name) | 493 | static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name) |
| 494 | { | 494 | { |
| 495 | unsigned long bar5 = pci_resource_start(dev, 5); | 495 | resource_size_t bar5 = pci_resource_start(dev, 5); |
| 496 | unsigned long barsize = pci_resource_len(dev, 5); | 496 | unsigned long barsize = pci_resource_len(dev, 5); |
| 497 | u8 tmpbyte = 0; | 497 | u8 tmpbyte = 0; |
| 498 | void __iomem *ioaddr; | 498 | void __iomem *ioaddr; |