diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /arch/arm/boot | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/bootp/init.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S index df7bc7068d0f..8b0de41c3dcb 100644 --- a/arch/arm/boot/bootp/init.S +++ b/arch/arm/boot/bootp/init.S | |||
| @@ -49,7 +49,7 @@ _start: add lr, pc, #-0x8 @ lr = current load addr | |||
| 49 | /* | 49 | /* |
| 50 | * find the end of the tag list, and then add an INITRD tag on the end. | 50 | * find the end of the tag list, and then add an INITRD tag on the end. |
| 51 | * If there is already an INITRD tag, then we ignore it; the last INITRD | 51 | * If there is already an INITRD tag, then we ignore it; the last INITRD |
| 52 | * tag takes precidence. | 52 | * tag takes precedence. |
| 53 | */ | 53 | */ |
| 54 | taglist: ldr r10, [r9, #0] @ tag length | 54 | taglist: ldr r10, [r9, #0] @ tag length |
| 55 | teq r10, #0 @ last tag (zero length)? | 55 | teq r10, #0 @ last tag (zero length)? |