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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
pci
/
rom.c
diff --git
a/drivers/pci/rom.c
b/drivers/pci/rom.c
index
f5ee7ce
..
598a115
100644
(file)
--- a/
drivers/pci/rom.c
+++ b/
drivers/pci/rom.c
@@
-6,6
+6,7
@@
*
* PCI ROM access routines
*/
*
* PCI ROM access routines
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/slab.h>
@@
-79,8
+80,8
@@
void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
} else {
if (res->flags & IORESOURCE_ROM_COPY) {
*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
} else {
if (res->flags & IORESOURCE_ROM_COPY) {
*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
- return (void __iomem *)
(unsigned long)
-
pci_resource_start(pdev,
PCI_ROM_RESOURCE);
+ return (void __iomem *)
pci_resource_start(pdev,
+
PCI_ROM_RESOURCE);
} else {
/* assign the ROM an address if it doesn't have one */
if (res->parent == NULL &&
} else {
/* assign the ROM an address if it doesn't have one */
if (res->parent == NULL &&
@@
-169,11
+170,11
@@
void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size)
return rom;
res->end = res->start + *size;
return rom;
res->end = res->start + *size;
- memcpy_fromio((void*)
(unsigned long)
res->start, rom, *size);
+ memcpy_fromio((void*)res->start, rom, *size);
pci_unmap_rom(pdev, rom);
res->flags |= IORESOURCE_ROM_COPY;
pci_unmap_rom(pdev, rom);
res->flags |= IORESOURCE_ROM_COPY;
- return (void __iomem *)
(unsigned long)
res->start;
+ return (void __iomem *)res->start;
}
/**
}
/**
@@
-226,7
+227,7
@@
void pci_cleanup_rom(struct pci_dev *pdev)
{
struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
if (res->flags & IORESOURCE_ROM_COPY) {
{
struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
if (res->flags & IORESOURCE_ROM_COPY) {
- kfree((void*)
(unsigned long)
res->start);
+ kfree((void*)res->start);
res->flags &= ~IORESOURCE_ROM_COPY;
res->start = 0;
res->end = 0;
res->flags &= ~IORESOURCE_ROM_COPY;
res->start = 0;
res->end = 0;