diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/arm/boot/bootp | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/arm/boot/bootp')
| -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)? |