diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/boot/bootp | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/boot/bootp')
| -rw-r--r-- | arch/arm/boot/bootp/init.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S index 8b0de41c3dcb..78b508075161 100644 --- a/arch/arm/boot/bootp/init.S +++ b/arch/arm/boot/bootp/init.S | |||
| @@ -73,6 +73,8 @@ move: ldmia r4!, {r7 - r10} @ move 32-bytes at a time | |||
| 73 | 73 | ||
| 74 | .size _start, . - _start | 74 | .size _start, . - _start |
| 75 | 75 | ||
| 76 | .align | ||
| 77 | |||
| 76 | .type data,#object | 78 | .type data,#object |
| 77 | data: .word initrd_start @ source initrd address | 79 | data: .word initrd_start @ source initrd address |
| 78 | .word initrd_phys @ destination initrd address | 80 | .word initrd_phys @ destination initrd address |