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/bootstd.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/bootstd.h')
| -rw-r--r-- | arch/m68k/include/asm/bootstd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/bootstd.h b/arch/m68k/include/asm/bootstd.h index bdc1a4ac4fe..e518f5a575b 100644 --- a/arch/m68k/include/asm/bootstd.h +++ b/arch/m68k/include/asm/bootstd.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #define __BN_flash_write_range 20 | 31 | #define __BN_flash_write_range 20 |
| 32 | 32 | ||
| 33 | /* Calling conventions compatible to (uC)linux/68k | 33 | /* Calling conventions compatible to (uC)linux/68k |
| 34 | * We use simmilar macros to call into the bootloader as for uClinux | 34 | * We use similar macros to call into the bootloader as for uClinux |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #define __bsc_return(type, res) \ | 37 | #define __bsc_return(type, res) \ |