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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
common-pci.c
diff --git
a/arch/arm/mach-ixp4xx/common-pci.c
b/arch/arm/mach-ixp4xx/common-pci.c
index
6e3462e
..
9562177
100644
(file)
--- a/
arch/arm/mach-ixp4xx/common-pci.c
+++ b/
arch/arm/mach-ixp4xx/common-pci.c
@@
-463,7
+463,7
@@
int ixp4xx_setup(int nr, struct pci_sys_data *sys)
if (nr >= 1)
return 0;
if (nr >= 1)
return 0;
- res = k
m
alloc(sizeof(*res) * 2, GFP_KERNEL);
+ res = k
z
alloc(sizeof(*res) * 2, GFP_KERNEL);
if (res == NULL) {
/*
* If we're out of memory this early, something is wrong,
if (res == NULL) {
/*
* If we're out of memory this early, something is wrong,
@@
-471,7
+471,6
@@
int ixp4xx_setup(int nr, struct pci_sys_data *sys)
*/
panic("PCI: unable to allocate resources?\n");
}
*/
panic("PCI: unable to allocate resources?\n");
}
- memset(res, 0, sizeof(*res) * 2);
local_write_config(PCI_COMMAND, 2, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
local_write_config(PCI_COMMAND, 2, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
@@
-533,8
+532,6
@@
pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
return -EIO;
}
return -EIO;
}
-EXPORT_SYMBOL(pci_set_dma_mask);
-EXPORT_SYMBOL(pci_set_consistent_dma_mask);
EXPORT_SYMBOL(ixp4xx_pci_read);
EXPORT_SYMBOL(ixp4xx_pci_write);
EXPORT_SYMBOL(ixp4xx_pci_read);
EXPORT_SYMBOL(ixp4xx_pci_write);