summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-07 14:26:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-07 14:26:53 -0700
commitad3c7e42e33a842cf3b518e21a7f69e167649d8a (patch)
tree10860203beaf5721f566d2b253d6e30c886d50f8
parent6ea0a4679d6a11c66cfeb26d15244fb6f9b52d14 (diff)
parentc976816b6e901341ec3c4653147316c15549a1c4 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: siimage: fix kernel oops on PPC 44x
-rw-r--r--drivers/ide/pci/siimage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index cc4be9621bc..8d624afe852 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 *
static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name)
{
- unsigned long bar5 = pci_resource_start(dev, 5);
+ resource_size_t bar5 = pci_resource_start(dev, 5);
unsigned long barsize = pci_resource_len(dev, 5);
u8 tmpbyte = 0;
void __iomem *ioaddr;