summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2003-01-10 04:17:51 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2003-01-10 04:17:51 -0800
commitc574597e1cc0bd6241ac72f65206552f94eb960c (patch)
tree6d64d32016cf05e1c87ffa93ddcf8f18c5ce5e93
parent1bf78ea9680ee48570e2bf15023f95846e2ba5a2 (diff)
[PATCH] fix 64bit cleanness on serverworks ide
-rw-r--r--drivers/ide/pci/serverworks.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index 2d368f249957..bdb9fc838da2 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -61,7 +61,7 @@ static int svwks_get_info (char *buffer, char **addr, off_t offset, int count)
for (i = 0; i < n_svwks_devs; i++) {
struct pci_dev *dev = svwks_devs[i];
- u32 bibma = pci_resource_start(dev, 4);
+ unsigned long bibma = pci_resource_start(dev, 4);
u32 reg40, reg44;
u16 reg48, reg56;
u8 reg54, c0=0, c1=0;
@@ -76,8 +76,8 @@ static int svwks_get_info (char *buffer, char **addr, off_t offset, int count)
* at that point bibma+0x2 et bibma+0xa are byte registers
* to investigate:
*/
- c0 = inb_p((unsigned short)bibma + 0x02);
- c1 = inb_p((unsigned short)bibma + 0x0a);
+ c0 = inb_p(bibma + 0x02);
+ c1 = inb_p(bibma + 0x0a);
p += sprintf(p, "\n ServerWorks ");
switch(dev->device) {