Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (130 commits)
  [ARM] 3856/1: Add clocksource for Intel IXP4xx platforms
  [ARM] 3855/1: Add generic time support
  [ARM] 3873/1: S3C24XX: Add irq_chip names
  [ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips
  [ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23
  [ARM] nommu: confirms the CR_V bit in nommu mode
  [ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
  [ARM] 3870/1: AT91: Start removing static memory mappings
  [ARM] 3869/1: AT91: NAND support for DK and KB9202 boards
  [ARM] 3868/1: AT91 hardware header update
  [ARM] 3867/1: AT91 GPIO update
  [ARM] 3866/1: AT91 clock update
  [ARM] 3865/1: AT91RM9200 header updates
  [ARM] 3862/2: S3C2410 - add basic power management support for AML M5900 series
  [ARM] kthread: switch arch/arm/kernel/apm.c
  [ARM] Off-by-one in arch/arm/common/icst*
  [ARM] 3864/1: Refactore sharpsl_pm
  [ARM] 3863/1: Add Locomo SPI Device
  [ARM] 3847/2:  Convert LOMOMO to use struct device for GPIOs
  [ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
  ...

1 files changed, 15 insertions, 12 deletions

diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c
index 823e25d4547e..a1ae49df5c3b 100644
--- 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:
-                        asm("ldr%?b     %0, [%1, %2]"
-                                : "=r" (v) : "r" (addr), "r" (where));
+                        asm("ldrb       %0, [%1, %2]"
+                                : "=r" (v) : "r" (addr), "r" (where) : "cc");
                         break;
                 case 2:
-                        asm("ldr%?h     %0, [%1, %2]"
-                                : "=r" (v) : "r" (addr), "r" (where));
+                        asm("ldrh       %0, [%1, %2]"
+                                : "=r" (v) : "r" (addr), "r" (where) : "cc");
                         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;
                 }
 
@@ -103,16 +103,19 @@ dc21285_write_config(struct pci_bus *bus, unsigned int devfn, int where,
         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:
-                        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:
-                        asm("str%?      %0, [%1, %2]"
-                                : : "r" (value), "r" (addr), "r" (where));
+                        asm("str        %0, [%1, %2]"
+                                : : "r" (value), "r" (addr), "r" (where)
+                                : "cc");
                         break;
                 }