diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 18:53:01 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 18:53:01 +0100 |
| commit | 168268a225d24da3768a88c1029fb3014b0837ca (patch) | |
| tree | afde019a1ac79366df0b96a2fcc8ba50bc5298fa /arch/mips/lib/delay.c | |
| parent | 04ee16bdf486061147c608410c2c9181352aaa3a (diff) | |
| parent | 6f1989bc982bc176b0d63e028e9b7f23ae1b4583 (diff) | |
Merge 'mmc/upstream' into late/mvebu2
These patches from the mmc tree were merged into v3.9 already
and the later mvebu patches depend on them.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/mips/lib/delay.c')
| -rw-r--r-- | arch/mips/lib/delay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lib/delay.c b/arch/mips/lib/delay.c index dc81ca8dc0dd..288f7954988d 100644 --- a/arch/mips/lib/delay.c +++ b/arch/mips/lib/delay.c @@ -21,7 +21,7 @@ void __delay(unsigned long loops) " .set noreorder \n" " .align 3 \n" "1: bnez %0, 1b \n" -#if __SIZEOF_LONG__ == 4 +#if BITS_PER_LONG == 32 " subu %0, 1 \n" #else " dsubu %0, 1 \n" |