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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-versatile
/
pci.c
diff --git
a/arch/arm/mach-versatile/pci.c
b/arch/arm/mach-versatile/pci.c
index
ba58223
..
ca82901
100644
(file)
--- a/
arch/arm/mach-versatile/pci.c
+++ b/
arch/arm/mach-versatile/pci.c
@@
-117,7
+117,10
@@
static int versatile_read_config(struct pci_bus *bus, unsigned int devfn, int wh
} else {
switch (size) {
case 1:
} else {
switch (size) {
case 1:
- v = __raw_readb(addr);
+ v = __raw_readl(addr);
+ if (where & 2) v >>= 16;
+ if (where & 1) v >>= 8;
+ v &= 0xff;
break;
case 2:
break;
case 2: