git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
drivers
/
pci
/
bios.c
diff --git
a/arch/cris/arch-v32/drivers/pci/bios.c
b/arch/cris/arch-v32/drivers/pci/bios.c
index
d4b9c36
..
bc0cfda
100644
(file)
--- a/
arch/cris/arch-v32/drivers/pci/bios.c
+++ b/
arch/cris/arch-v32/drivers/pci/bios.c
@@
-50,7
+50,7
@@
pcibios_align_resource(void *data, const struct resource *res,
if ((res->flags & IORESOURCE_IO) && (start & 0x300))
start = (start + 0x3ff) & ~0x3ff;
if ((res->flags & IORESOURCE_IO) && (start & 0x300))
start = (start + 0x3ff) & ~0x3ff;
- return start
+ return start
;
}
int pcibios_enable_resources(struct pci_dev *dev, int mask)
}
int pcibios_enable_resources(struct pci_dev *dev, int mask)