diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /arch/m68k/include/asm/delay_no.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'arch/m68k/include/asm/delay_no.h')
| -rw-r--r-- | arch/m68k/include/asm/delay_no.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/delay_no.h b/arch/m68k/include/asm/delay_no.h index 55cbd6294ab6..c3a0edc90f21 100644 --- a/arch/m68k/include/asm/delay_no.h +++ b/arch/m68k/include/asm/delay_no.h | |||
| @@ -16,7 +16,7 @@ static inline void __delay(unsigned long loops) | |||
| 16 | * long word alignment which is the faster version. | 16 | * long word alignment which is the faster version. |
| 17 | * The 0x4a8e is of course a 'tstl %fp' instruction. This is better | 17 | * The 0x4a8e is of course a 'tstl %fp' instruction. This is better |
| 18 | * than using a NOP (0x4e71) instruction because it executes in one | 18 | * than using a NOP (0x4e71) instruction because it executes in one |
| 19 | * cycle not three and doesn't allow for an arbitary delay waiting | 19 | * cycle not three and doesn't allow for an arbitrary delay waiting |
| 20 | * for bus cycles to finish. Also fp/a6 isn't likely to cause a | 20 | * for bus cycles to finish. Also fp/a6 isn't likely to cause a |
| 21 | * stall waiting for the register to become valid if such is added | 21 | * stall waiting for the register to become valid if such is added |
| 22 | * to the coldfire at some stage. | 22 | * to the coldfire at some stage. |