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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
mach-iop3xx
/
iq31244-pci.c
diff --git
a/arch/arm/mach-iop3xx/iq31244-pci.c
b/arch/arm/mach-iop3xx/iq31244-pci.c
index
f997daa
..
f3c6413
100644
(file)
--- a/
arch/arm/mach-iop3xx/iq31244-pci.c
+++ b/
arch/arm/mach-iop3xx/iq31244-pci.c
@@
-14,6
+14,8
@@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
#include <asm/hardware.h>
#include <asm/irq.h>
#include <asm/hardware.h>
#include <asm/irq.h>
@@
-72,12
+74,10
@@
static int iq31244_setup(int nr, struct pci_sys_data *sys)
if(nr != 0)
return 0;
if(nr != 0)
return 0;
- res = k
m
alloc(sizeof(struct resource) * 2, GFP_KERNEL);
+ res = k
z
alloc(sizeof(struct resource) * 2, GFP_KERNEL);
if (!res)
panic("PCI: unable to alloc resources");
if (!res)
panic("PCI: unable to alloc resources");
- memset(res, 0, sizeof(struct resource) * 2);
-
res[0].start = IOP321_PCI_LOWER_IO_VA;
res[0].end = IOP321_PCI_UPPER_IO_VA;
res[0].name = "IQ31244 PCI I/O Space";
res[0].start = IOP321_PCI_LOWER_IO_VA;
res[0].end = IOP321_PCI_UPPER_IO_VA;
res[0].name = "IQ31244 PCI I/O Space";