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 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
mach-footbridge
/
dc21285.c
diff --git
a/arch/arm/mach-footbridge/dc21285.c
b/arch/arm/mach-footbridge/dc21285.c
index
823e25d
..
a1ae49d
100644
(file)
--- a/
arch/arm/mach-footbridge/dc21285.c
+++ b/
arch/arm/mach-footbridge/dc21285.c
@@
-69,16
+69,16
@@
dc21285_read_config(struct pci_bus *bus, unsigned int devfn, int where,
if (addr)
switch (size) {
case 1:
if (addr)
switch (size) {
case 1:
- asm("ldr
%?b
%0, [%1, %2]"
- : "=r" (v) : "r" (addr), "r" (where));
+ asm("ldr
b
%0, [%1, %2]"
+ : "=r" (v) : "r" (addr), "r" (where)
: "cc"
);
break;
case 2:
break;
case 2:
- asm("ldr
%?h
%0, [%1, %2]"
- : "=r" (v) : "r" (addr), "r" (where));
+ asm("ldr
h
%0, [%1, %2]"
+ : "=r" (v) : "r" (addr), "r" (where)
: "cc"
);
break;
case 4:
break;
case 4:
- asm("ldr
%?
%0, [%1, %2]"
- : "=r" (v) : "r" (addr), "r" (where));
+ asm("ldr
%0, [%1, %2]"
+ : "=r" (v) : "r" (addr), "r" (where)
: "cc"
);
break;
}
break;
}
@@
-103,16
+103,19
@@
dc21285_write_config(struct pci_bus *bus, unsigned int devfn, int where,
if (addr)
switch (size) {
case 1:
if (addr)
switch (size) {
case 1:
- asm("str%?b %0, [%1, %2]"
- : : "r" (value), "r" (addr), "r" (where));
+ asm("strb %0, [%1, %2]"
+ : : "r" (value), "r" (addr), "r" (where)
+ : "cc");
break;
case 2:
break;
case 2:
- asm("str%?h %0, [%1, %2]"
- : : "r" (value), "r" (addr), "r" (where));
+ asm("strh %0, [%1, %2]"
+ : : "r" (value), "r" (addr), "r" (where)
+ : "cc");
break;
case 4:
break;
case 4:
- asm("str%? %0, [%1, %2]"
- : : "r" (value), "r" (addr), "r" (where));
+ asm("str %0, [%1, %2]"
+ : : "r" (value), "r" (addr), "r" (where)
+ : "cc");
break;
}
break;
}