git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
pnp
/
interface.c
diff --git
a/drivers/pnp/interface.c
b/drivers/pnp/interface.c
index
9d8b415
..
a2d8ce7
100644
(file)
--- a/
drivers/pnp/interface.c
+++ b/
drivers/pnp/interface.c
@@
-264,9
+264,9
@@
static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at
if (pnp_port_flags(dev, i) & IORESOURCE_DISABLED)
pnp_printf(buffer," disabled\n");
else
if (pnp_port_flags(dev, i) & IORESOURCE_DISABLED)
pnp_printf(buffer," disabled\n");
else
- pnp_printf(buffer," 0x%l
lx-0x%l
lx\n",
-
(unsigned long long)
pnp_port_start(dev, i),
-
(unsigned long long)
pnp_port_end(dev, i));
+ pnp_printf(buffer," 0x%l
x-0x%
lx\n",
+
pnp_port_start(dev, i),
+
pnp_port_end(dev, i));
}
}
for (i = 0; i < PNP_MAX_MEM; i++) {
}
}
for (i = 0; i < PNP_MAX_MEM; i++) {
@@
-275,9
+275,9
@@
static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at
if (pnp_mem_flags(dev, i) & IORESOURCE_DISABLED)
pnp_printf(buffer," disabled\n");
else
if (pnp_mem_flags(dev, i) & IORESOURCE_DISABLED)
pnp_printf(buffer," disabled\n");
else
- pnp_printf(buffer," 0x%l
lx-0x%l
lx\n",
-
(unsigned long long)
pnp_mem_start(dev, i),
-
(unsigned long long)
pnp_mem_end(dev, i));
+ pnp_printf(buffer," 0x%l
x-0x%
lx\n",
+
pnp_mem_start(dev, i),
+
pnp_mem_end(dev, i));
}
}
for (i = 0; i < PNP_MAX_IRQ; i++) {
}
}
for (i = 0; i < PNP_MAX_IRQ; i++) {
@@
-286,8
+286,8
@@
static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at
if (pnp_irq_flags(dev, i) & IORESOURCE_DISABLED)
pnp_printf(buffer," disabled\n");
else
if (pnp_irq_flags(dev, i) & IORESOURCE_DISABLED)
pnp_printf(buffer," disabled\n");
else
- pnp_printf(buffer," %l
l
d\n",
-
(unsigned long long)
pnp_irq(dev, i));
+ pnp_printf(buffer," %ld\n",
+
pnp_irq(dev, i));
}
}
for (i = 0; i < PNP_MAX_DMA; i++) {
}
}
for (i = 0; i < PNP_MAX_DMA; i++) {
@@
-296,8
+296,8
@@
static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_at
if (pnp_dma_flags(dev, i) & IORESOURCE_DISABLED)
pnp_printf(buffer," disabled\n");
else
if (pnp_dma_flags(dev, i) & IORESOURCE_DISABLED)
pnp_printf(buffer," disabled\n");
else
- pnp_printf(buffer," %l
l
d\n",
-
(unsigned long long)
pnp_dma(dev, i));
+ pnp_printf(buffer," %ld\n",
+
pnp_dma(dev, i));
}
}
ret = (buffer->curr - buf);
}
}
ret = (buffer->curr - buf);